diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-06-05 17:37:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-05 17:37:15 +0200 |
commit | 9300fbf3f560e2e4af39c9514c6de5883ce3c881 (patch) | |
tree | 95a6d61c5c8245b8f825272e377fe2c18fe2612c | |
parent | ef14c4c963c7515679eb8092d218dfe857f9d503 (diff) | |
parent | 2596ac464f0d9895bedae30746f0c51712036c8a (diff) |
Merge pull request #27293 from vespa-engine/freva/fix-todos
Revert "Always write cloudAccount for GCP LBs"
2 files changed, 1 insertions, 11 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 5284511af47..e228d31384c 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,10 +119,6 @@ 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 fe40b2c5001..ae1edab7fad 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,16 +70,10 @@ 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 -> { - // 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()); - }); + loadBalancer.ifPresent(lb -> db.writeLoadBalancer(lb, lb.state())); } } } |