Remove use of 'enable-server-ocsp-stapling' feature flag

2 files changed, 18 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
index 47dab37cc14..9997b20d205 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
@@ -27,7 +27,6 @@ public final class ApplicationContainer extends Container implements
     private static final String defaultHostedJVMArgs = "-XX:+SuppressFatalErrorMessage";
 
     private final boolean isHostedVespa;
-    private final boolean enableServerOcspStapling;
 
     public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) {
         this(parent, name, false, index, deployState);
@@ -36,7 +35,6 @@ public final class ApplicationContainer extends Container implements
     public ApplicationContainer(AbstractConfigProducer<?> parent, String name, boolean retired, int index, DeployState deployState) {
         super(parent, name, retired, index, deployState);
         this.isHostedVespa = deployState.isHosted();
-        this.enableServerOcspStapling = deployState.featureFlags().enableServerOcspStapling();
 
         addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerHolder"));
         addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider"));
@@ -68,12 +66,10 @@ public final class ApplicationContainer extends Container implements
             if (hasDocproc()) {
                 b.append(ApplicationContainer.defaultHostedJVMArgs).append(' ');
             }
-            if (enableServerOcspStapling) {
-                b.append("-Djdk.tls.server.enableStatusRequestExtension=true ")
-                        .append("-Djdk.tls.stapling.responseTimeout=2000 ")
-                        .append("-Djdk.tls.stapling.cacheSize=256 ")
-                        .append("-Djdk.tls.stapling.cacheLifetime=3600 ");
-            }
+            b.append("-Djdk.tls.server.enableStatusRequestExtension=true ")
+                    .append("-Djdk.tls.stapling.responseTimeout=2000 ")
+                    .append("-Djdk.tls.stapling.cacheSize=256 ")
+                    .append("-Djdk.tls.stapling.cacheLifetime=3600 ");
         }
         String jvmArgs = super.getJvmOptions();
         if (!jvmArgs.isBlank()) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 198b5713876..b634356fcb6 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -162,15 +162,15 @@ public class ContainerClusterTest {
         addContainer(root, cluster, "c1", "host-c1");
         assertEquals(1, cluster.getContainers().size());
         ApplicationContainer container = cluster.getContainers().get(0);
-        verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions());
+        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions());
         container.setJvmOptions("initial");
-        verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions());
+        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "initial"), container.getJvmOptions());
         container.prependJvmOptions("ignored");
-        verifyJvmArgs(isHosted, hasDocProc, "ignored initial", container.getJvmOptions());
+        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial"), container.getJvmOptions());
         container.appendJvmOptions("override");
-        verifyJvmArgs(isHosted, hasDocProc, "ignored initial override", container.getJvmOptions());
+        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial override"), container.getJvmOptions());
         container.setJvmOptions(null);
-        verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions());
+        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions());
     }
 
     @Test
@@ -510,4 +510,13 @@ public class ContainerClusterTest {
         return new ClusterInfoConfig(builder);
     }
 
+    private static String expectedJvmArgs(boolean isHosted, String extra) {
+        if (!isHosted) return extra;
+        return "-Djdk.tls.server.enableStatusRequestExtension=true " +
+                "-Djdk.tls.stapling.responseTimeout=2000 " +
+                "-Djdk.tls.stapling.cacheSize=256 " +
+                "-Djdk.tls.stapling.cacheLifetime=3600" +
+                (extra.isEmpty() ? "" : " " + extra);
+    }
+
 }