Merge pull request #13655 from vespa-engine/mpolden/enable-flag-everywhere

Enable configserver-provision-lb by default

3 files changed, 3 insertions, 11 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
index 8d6316d447f..d7440a706ea 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
@@ -4,8 +4,6 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.flags.Flags;
-import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.LoadBalancer;
 import com.yahoo.vespa.hosted.controller.api.integration.dns.Record;
@@ -41,13 +39,7 @@ public class SystemRoutingPolicyMaintainerTest {
                                                                               LoadBalancer.State.active,
                                                                               Optional.of("dns-zone-1"))));
 
-        // Nothing happens without feature flag
-        updater.run();
-        dispatcher.run();
-        assertEquals(Set.of(), tester.nameService().records());
-
         // Record is created
-        ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.CONFIGSERVER_PROVISION_LB.id(), true);
         updater.run();
         dispatcher.run();
         Set<Record> records = tester.nameService().records();
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index c8ef8060dae..59ac4b81d35 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -276,7 +276,7 @@ public class Flags {
     );
 
     public static final UnboundBooleanFlag CONFIGSERVER_PROVISION_LB = defineFeatureFlag(
-            "configserver-provision-lb", false,
+            "configserver-provision-lb", true,
             "Provision load balancer for config server cluster",
             "Takes effect when zone-config-servers application is redeployed",
             ZONE_ID
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index 2a87f513cd9..f27775db570 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -97,8 +97,8 @@ public class AclProvisioningTest {
                 .orElseThrow(() -> new RuntimeException("Failed to find cfg1"));
         List<NodeAcl> nodeAcls = tester.nodeRepository().getNodeAcls(node, false);
 
-        // Trusted nodes is all tenant nodes, all proxy nodes and all config servers
-        assertAcls(List.of(tenantNodes, proxyNodes, configServers), nodeAcls);
+        // Trusted nodes is all tenant nodes, all proxy nodes, all config servers and load balancer subnets
+        assertAcls(List.of(tenantNodes, proxyNodes, configServers), Set.of("10.2.3.0/24", "10.4.5.0/24"), nodeAcls);
     }
 
     @Test