diff options
| author | Harald Musum <musum@verizonmedia.com> | 2023-06-20 10:27:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 10:27:26 +0200 |
| commit | d79c1f5a8226b555969a614ce6bc7731276ad9bb (patch) | |
| tree | 44e5763023c36511786925d523519c2cbff10be2 | |
| parent | 0e4d729f4a63a0215e2384ca9401bab32f0f20c6 (diff) | |
| parent | db264e5c6d40bf0a9f060ebffeeb5c479af09539 (diff) | |
Merge pull request #27487 from vespa-engine/mortent/dpt-handle-redeploy
Read dataplane tokens on redeploy
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 3 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index cab3e89c606..062133b6b6e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -290,7 +290,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment { .isBootstrap(isBootstrap) .force(force) .waitForResourcesInPrepare(waitForResourcesInPrepare) - .tenantSecretStores(session.getTenantSecretStores()); + .tenantSecretStores(session.getTenantSecretStores()) + .dataplaneTokens(session.getDataplaneTokens()); session.getDockerImageRepository().ifPresent(params::dockerImageRepository); session.getAthenzDomain().ifPresent(params::athenzDomain); session.getCloudAccount().ifPresent(params::cloudAccount); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index ff661fbcc74..f82aa405380 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -283,6 +283,7 @@ public class SessionRepository { session.setTenantSecretStores(existingSession.getTenantSecretStores()); session.setOperatorCertificates(existingSession.getOperatorCertificates()); session.setCloudAccount(existingSession.getCloudAccount()); + session.setDataplaneTokens(existingSession.getDataplaneTokens()); return session; } |