Merge pull request #21044 from vespa-engine/mortent/extend-flags

Extend and prepare for removal of flags

4 files changed, 6 insertions, 24 deletions

diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def
index 5a277eaed9d..3102d52b119 100644
--- a/configdefinitions/src/vespa/lb-services.def
+++ b/configdefinitions/src/vespa/lb-services.def
@@ -8,7 +8,7 @@ namespace=cloud.config
 # Default true for now (since code in config-model to set it is not ready yet), should have no default value
 tenants{}.applications{}.activeRotation                                 bool default=true
 tenants{}.applications{}.usePowerOfTwoChoicesLb                         bool default=true
-tenants{}.applications{}.generateNonMtlsEndpoint                        bool default=true
+tenants{}.applications{}.generateNonMtlsEndpoint                        bool default=false
 
 tenants{}.applications{}.hosts{}.hostname                               string default="(unknownhostname)"
 tenants{}.applications{}.hosts{}.services{}.type                        string default="(noservicetype)"
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
index dccabca2858..69bef89056d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
@@ -37,12 +37,10 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
 
     private final Map<TenantName, Set<ApplicationInfo>> models;
     private final Zone zone;
-    private final BooleanFlag generateNonMtlsEndpoint;
 
     public LbServicesProducer(Map<TenantName, Set<ApplicationInfo>> models, Zone zone, FlagSource flagSource) {
         this.models = models;
         this.zone = zone;
-        generateNonMtlsEndpoint = Flags.GENERATE_NON_MTLS_ENDPOINT.bindTo(flagSource);
     }
 
     @Override
@@ -77,7 +75,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
         // TODO: read active rotation from ApplicationClusterInfo
         ab.activeRotation(getActiveRotation(app));
         ab.usePowerOfTwoChoicesLb(true);
-        ab.generateNonMtlsEndpoint(generateNonMtlsEndpoint(app));
+        ab.generateNonMtlsEndpoint(false);
 
         // TODO: Remove when endpoints-config is read by all load balancers
         app.getModel().getHosts().stream()
@@ -123,10 +121,6 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
         return activeRotation;
     }
 
-    private boolean generateNonMtlsEndpoint(ApplicationInfo app) {
-        return generateNonMtlsEndpoint.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value();
-    }
-
     private LbServicesConfig.Tenants.Applications.Hosts.Builder getHostsConfig(HostInfo hostInfo) {
         LbServicesConfig.Tenants.Applications.Hosts.Builder hb = new LbServicesConfig.Tenants.Applications.Hosts.Builder();
         hb.hostname(hostInfo.getHostname());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 402e2576591..1e37e382247 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -119,18 +119,6 @@ public class LbServicesProducerTest {
         }
     }
 
-    @Test
-    public void generate_non_mtls_endpoints_from_feature_flag() {
-        RegionName regionName = RegionName.from("us-east-1");
-
-        LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
-        assertTrue(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").generateNonMtlsEndpoint());
-
-        flagSource.withBooleanFlag(Flags.GENERATE_NON_MTLS_ENDPOINT.id(), false);
-        conf = createModelAndGetLbServicesConfig(regionName);
-        assertFalse(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").generateNonMtlsEndpoint());
-    }
-
     private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) {
         Zone zone = new Zone(Environment.prod, regionName);
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder().zone(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 1bf8018e18c..3e10974ec9a 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -172,8 +172,8 @@ public class Flags {
             "takes effect at redeployment");
 
     public static final UnboundBooleanFlag GENERATE_NON_MTLS_ENDPOINT = defineFeatureFlag(
-            "generate-non-mtls-endpoint", true,
-            List.of("tokle"), "2021-02-18", "2022-02-01",
+            "generate-non-mtls-endpoint", false,
+            List.of("tokle"), "2021-02-18", "2022-03-01",
             "Whether to generate the non-mtls endpoint",
             "Takes effect on next internal redeployment",
             APPLICATION_ID);
@@ -238,7 +238,7 @@ public class Flags {
 
     public static final UnboundBooleanFlag ENABLE_ROUTING_REUSE_PORT = defineFeatureFlag(
             "enable-routing-reuse-port", true,
-            List.of("mortent"), "2021-09-29", "2022-02-01",
+            List.of("mortent"), "2021-09-29", "2022-03-01",
             "Enable reuse port in routing configuration",
             "Takes effect on container restart",
             HOSTNAME
@@ -278,7 +278,7 @@ public class Flags {
 
     public static final UnboundBooleanFlag USE_LEGACY_LB_SERVICES = defineFeatureFlag(
             "use-legacy-lb-services", false,
-            List.of("tokle"), "2021-11-22", "2022-02-01",
+            List.of("tokle"), "2021-11-22", "2022-03-01",
             "Whether to generate routing table based on legacy lb-services config",
             "Takes effect on container reboot",
             ZONE_ID, HOSTNAME);