Merge pull request #33040 from vespa-engine/mortent/always-launch-app…

…service-public Always launch application service
vespa-engine · Dec 16, 2024 · 4f339ac · 4f339ac
2 parents 2cce992 + 13641b7
commit 4f339ac
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -183,7 +183,8 @@ interface Properties {
 
         default List<String> requestPrefixForLoggingContent() { return List.of(); }
 
-        default boolean launchApplicationAthenzService() { return false; }
+        // Remove after 8.457 is the oldest model
+        default boolean launchApplicationAthenzService() { return true; }
 
     }
 

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -87,7 +87,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean logserverOtelCol = false;
     private boolean symmetricPutAndActivateReplicaSelection = false;
     private boolean enforceStrictlyIncreasingClusterStateVersions = false;
-    private boolean launchApplicationAthenzService = false;
     private boolean distributionConfigFromClusterController = false;
 
     @Override public ModelContext.FeatureFlags featureFlags() { return this; }
@@ -150,7 +149,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean logserverOtelCol() { return logserverOtelCol; }
     @Override public boolean symmetricPutAndActivateReplicaSelection() { return symmetricPutAndActivateReplicaSelection; }
     @Override public boolean enforceStrictlyIncreasingClusterStateVersions() { return enforceStrictlyIncreasingClusterStateVersions; }
-    @Override public boolean launchApplicationAthenzService() { return launchApplicationAthenzService; }
     @Override public boolean distributionConfigFromClusterController() { return distributionConfigFromClusterController; }
 
     public TestProperties sharedStringRepoNoReclaim(boolean sharedStringRepoNoReclaim) {
@@ -402,11 +400,6 @@ public TestProperties setEnforceStrictlyIncreasingClusterStateVersions(boolean e
         return this;
     }
 
-    public TestProperties setLaunchApplicationAthenzService(boolean launch) {
-        this.launchApplicationAthenzService = launch;
-        return this;
-    }
-
     public TestProperties setDistributionConfigFromClusterController(boolean configFromCc) {
         this.distributionConfigFromClusterController = configFromCc;
         return this;

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -372,7 +372,6 @@ private void addCloudSecretStore(ApplicationContainerCluster cluster, Element se
     private void addAthenzServiceIdentityProvider(ApplicationContainerCluster cluster, ConfigModelContext context) {
         if ( ! context.getDeployState().isHosted()) return;
         if ( ! context.getDeployState().zone().system().isPublic()) return; // Non-public is handled by deployment spec config.
-        if ( ! context.properties().launchApplicationAthenzService()) return;
         var appContext = context.getDeployState().zone().environment().isManuallyDeployed() ? "sandbox" : "production";
         addIdentityProvider(cluster,
                             context.getDeployState().getProperties().configServerSpecs(),

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -363,7 +363,6 @@ public static class Properties implements ModelContext.Properties {
         private final boolean allowUserFilters;
         private final Duration endpointConnectionTtl;
         private final List<String> requestPrefixForLoggingContent;
-        private final boolean launchApplicationAthenzService;
 
         public Properties(ApplicationId applicationId,
                           Version modelVersion,
@@ -414,7 +413,6 @@ public Properties(ApplicationId applicationId,
             this.endpointConnectionTtl = Duration.ofSeconds(PermanentFlags.ENDPOINT_CONNECTION_TTL.bindTo(flagSource).with(applicationId).value());
             this.dataplaneTokens = dataplaneTokens;
             this.requestPrefixForLoggingContent = PermanentFlags.LOG_REQUEST_CONTENT.bindTo(flagSource).with(applicationId).value();
-            this.launchApplicationAthenzService = Flags.LAUNCH_APPLICATION_ATHENZ_SERVICE.bindTo(flagSource).with(applicationId).with(modelVersion).value();
         }
 
         @Override public ModelContext.FeatureFlags featureFlags() { return featureFlags; }
@@ -526,8 +524,6 @@ public List<DataplaneToken> dataplaneTokens() {
         @Override public Duration endpointConnectionTtl() { return endpointConnectionTtl; }
 
         @Override public List<String> requestPrefixForLoggingContent() { return requestPrefixForLoggingContent; }
-
-        @Override public boolean launchApplicationAthenzService() { return launchApplicationAthenzService; }
     }
 
 }
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -420,7 +420,7 @@ public class Flags {
             INSTANCE_ID);
 
     public static final UnboundBooleanFlag LAUNCH_APPLICATION_ATHENZ_SERVICE = defineFeatureFlag(
-            "launch-application-athenz-service", false,
+            "launch-application-athenz-service", true,
             List.of("hmusum"), "2024-06-11", "2025-02-01",
             "Whether to launch an Athenz service unique to the application. Only valid in public systems!",
             "Takes effect on next deployment",