Unset cloud account in GCP

2 files changed, 11 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index 478d49d67d4..01fc103423c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -5,6 +5,8 @@ import com.yahoo.collections.ListMap;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationTransaction;
+import com.yahoo.config.provision.CloudAccount;
+import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeType;
@@ -81,8 +83,10 @@ public class Nodes {
         Instant start = clock.instant();
         int nodesWritten = performOn(list(), (node, mutex) -> {
             // TODO (valerijf): Remove after 8.162
-            if (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified())
-                node = node.with(zone.getCloud().account());
+//            if (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified())
+//                node = node.with(zone.getCloud().account());
+            if (zone.getCloud().name().equals(CloudName.GCP))
+                node = node.with(CloudAccount.empty);
             return write(node, mutex);
         }).size();
         Instant end = clock.instant();
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 b6b07ddf671..2fd8915bee1 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
@@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ApplicationTransaction;
 import com.yahoo.config.provision.CloudAccount;
+import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
@@ -75,8 +76,10 @@ public class LoadBalancerProvisioner {
             try (var lock = db.lock(id.application())) {
                 var loadBalancer = db.readLoadBalancer(id);
                 loadBalancer.ifPresent(lb -> {
-                    if (!zoneAccount.isUnspecified() && lb.instance().isPresent() && lb.instance().get().cloudAccount().isUnspecified())
-                        lb = lb.with(Optional.of(lb.instance().get().with(zoneAccount)));
+//                    if (!zoneAccount.isUnspecified() && lb.instance().isPresent() && lb.instance().get().cloudAccount().isUnspecified())
+//                        lb = lb.with(Optional.of(lb.instance().get().with(zoneAccount)));
+                    if (nodeRepository.zone().getCloud().name().equals(CloudName.GCP))
+                        lb = lb.with(lb.instance().map(i -> i.with(CloudAccount.empty)));
                     db.writeLoadBalancer(lb, lb.state());
                 });
             }