diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-05-15 15:28:56 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-05-15 15:31:22 +0200 |
commit | fe7876516c97365c22d975fb25b6f2cd4a54e0f8 (patch) | |
tree | 693ec4ba9e9acdb3e58c7a30db421da47ae8a48b | |
parent | 5e18b160b3dd2cd852441ea89d0c4efbb6b14232 (diff) |
Always write cloudAccount for GCP LBs
2 files changed, 11 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java index e228d31384c..5284511af47 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java @@ -119,6 +119,10 @@ public class LoadBalancerInstance { cloudAccount); } + public LoadBalancerInstance with(CloudAccount cloudAccount) { + return new LoadBalancerInstance(hostname, ipAddress, dnsZone, ports, networks, reals, settings, serviceIds, cloudAccount); + } + /** Prepends the given service IDs, possibly changing the order of those we have in this. */ public LoadBalancerInstance withServiceIds(List<PrivateServiceId> serviceIds) { List<PrivateServiceId> ids = new ArrayList<>(serviceIds); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index ae1edab7fad..fe40b2c5001 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -70,10 +70,16 @@ public class LoadBalancerProvisioner { this.deactivateRouting = PermanentFlags.DEACTIVATE_ROUTING.bindTo(nodeRepository.flagSource()); // Read and write all load balancers to make sure they are stored in the latest version of the serialization format + CloudAccount zoneAccount = nodeRepository.zone().cloud().account(); for (var id : db.readLoadBalancerIds()) { try (var lock = db.lock(id.application())) { var loadBalancer = db.readLoadBalancer(id); - loadBalancer.ifPresent(lb -> db.writeLoadBalancer(lb, lb.state())); + loadBalancer.ifPresent(lb -> { + // TODO (freva): Remove after 8.166 + if (!zoneAccount.isUnspecified() && lb.instance().isPresent() && lb.instance().get().cloudAccount().isUnspecified()) + lb = lb.with(Optional.of(lb.instance().get().with(zoneAccount))); + db.writeLoadBalancer(lb, lb.state()); + }); } } } |