Merge pull request #13682 from vespa-engine/mpolden/remove-flag

Remove configserver-provision-lb flag

4 files changed, 1 insertions, 19 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainer.java
index 6c271ed0470..0fe6f7e0bfb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainer.java
@@ -2,9 +2,6 @@
 package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.config.application.api.DeploymentSpec;
-import com.yahoo.vespa.flags.BooleanFlag;
-import com.yahoo.vespa.flags.FetchVector;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
@@ -19,11 +16,8 @@ import java.time.Duration;
  */
 public class SystemRoutingPolicyMaintainer extends ControllerMaintainer {
 
-    private final BooleanFlag featureFlag;
-
     public SystemRoutingPolicyMaintainer(Controller controller, Duration interval) {
         super(controller, interval);
-        this.featureFlag = Flags.CONFIGSERVER_PROVISION_LB.bindTo(controller.flagSource());
     }
 
     @Override
@@ -31,7 +25,6 @@ public class SystemRoutingPolicyMaintainer extends ControllerMaintainer {
         for (var zone : controller().zoneRegistry().zones().all().ids()) {
             for (var application : SystemApplication.values()) {
                 if (!application.hasEndpoint()) continue;
-                if (!featureFlag.with(FetchVector.Dimension.ZONE_ID, zone.value()).value()) continue;
                 controller().routing().policies().refresh(application.id(), DeploymentSpec.empty, zone);
             }
         }
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 696cb431e97..407196eda03 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -275,13 +275,6 @@ public class Flags {
             CONSOLE_USER_EMAIL
     );
 
-    public static final UnboundBooleanFlag CONFIGSERVER_PROVISION_LB = defineFeatureFlag(
-            "configserver-provision-lb", true,
-            "Provision load balancer for config server cluster",
-            "Takes effect when zone-config-servers application is redeployed",
-            ZONE_ID
-    );
-
     public static final UnboundBooleanFlag CONTROLLER_PROVISION_LB = defineFeatureFlag(
             "controller-provision-lb", false,
             "Provision load balancer for controller cluster",
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 bb25e8371a2..e710d70f20f 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
@@ -50,14 +50,12 @@ public class LoadBalancerProvisioner {
     private final NodeRepository nodeRepository;
     private final CuratorDatabaseClient db;
     private final LoadBalancerService service;
-    private final BooleanFlag provisionConfigServerLoadBalancer;
     private final BooleanFlag provisionControllerLoadBalancer;
 
     public LoadBalancerProvisioner(NodeRepository nodeRepository, LoadBalancerService service, FlagSource flagSource) {
         this.nodeRepository = nodeRepository;
         this.db = nodeRepository.database();
         this.service = service;
-        this.provisionConfigServerLoadBalancer = Flags.CONFIGSERVER_PROVISION_LB.bindTo(flagSource);
         this.provisionControllerLoadBalancer = Flags.CONTROLLER_PROVISION_LB.bindTo(flagSource);
         // Read and write all load balancers to make sure they are stored in the latest version of the serialization format
         for (var id : db.readLoadBalancerIds()) {
@@ -149,11 +147,10 @@ public class LoadBalancerProvisioner {
         db.writeLoadBalancers(deactivatedLoadBalancers, transaction);
     }
 
-    // TODO(mpolden): Inline when feature flags are removed
+    // TODO(mpolden): Inline when feature flag is removed
     private boolean canForwardTo(NodeType type, ClusterSpec cluster) {
         boolean canForwardTo = service.canForwardTo(type, cluster.type());
         if (canForwardTo) {
-            if (type == NodeType.config) return provisionConfigServerLoadBalancer.value();
             if (type == NodeType.controller) return provisionControllerLoadBalancer.value();
         }
         return canForwardTo;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
index b4a1a4afe9b..29a121b8a21 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
@@ -217,7 +217,6 @@ public class LoadBalancerProvisionerTest {
 
     @Test
     public void provision_load_balancer_config_server_cluster() {
-        flagSource.withBooleanFlag(Flags.CONFIGSERVER_PROVISION_LB.id(), true);
         ApplicationId configServerApp = ApplicationId.from("hosted-vespa", "zone-config-servers", "default");
         Supplier<List<LoadBalancer>> lbs = () -> tester.nodeRepository().loadBalancers(configServerApp).asList();
         var cluster = ClusterSpec.Id.from("zone-config-servers");