never generate non-mtls endpoints

3 files changed, 2 insertions, 20 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));