diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-05 11:42:31 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-09-05 11:42:31 +0200 |
| commit | 70c1838db4f31b226f8abf84814c644a4731b604 (patch) | |
| tree | b83bc1c5755199449faba79c9e3eec322af8caf1 /configserver | |
| parent | 6ee682d64a75ebb4a038bd74bacb6052c71eec60 (diff) | |
Preserve cloud account on internal redeploy
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 1 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java | 2 |
2 files changed, 3 insertions, 0 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 59a48ad3c7e..df449ca017b 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 @@ -277,6 +277,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { .tenantSecretStores(session.getTenantSecretStores()); session.getDockerImageRepository().ifPresent(params::dockerImageRepository); session.getAthenzDomain().ifPresent(params::athenzDomain); + session.getCloudAccount().ifPresent(params::cloudAccount); return params.build(); }); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index e146f0de187..988d13b1978 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -325,6 +325,8 @@ public class SessionZooKeeperClient { if (cloudAccount.isPresent()) { byte[] data = uncheck(() -> SlimeUtils.toJsonBytes(CloudAccountSerializer.toSlime(cloudAccount.get()))); curator.set(cloudAccountPath(), data); + } else { + curator.delete(cloudAccountPath()); } } |