diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-04-25 08:48:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-25 08:48:27 +0200 |
commit | 2edef045a83431a0c240cacdeae0a3d9ae25bb71 (patch) | |
tree | 17ec76a3e5315e6d11d0ac6ac4c86554ef71a9a1 /configserver | |
parent | 0992b8c00b5f3dcffd86a7691f7b20304288eb42 (diff) |
Revert "Revert "Revert "Flag to allow disabling mtls"""
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 8 |
1 files changed, 0 insertions, 8 deletions
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 index 8c2be6a5b07..34220b64808 100644 --- 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 @@ -28,7 +28,6 @@ import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; import com.yahoo.vespa.config.server.tenant.SecretStoreExternalIdRetriever; -import com.yahoo.vespa.flags.BooleanFlag; import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.Flags; @@ -296,7 +295,6 @@ public class ModelContextImpl implements ModelContext { private final List<TenantSecretStore> tenantSecretStores; private final SecretStore secretStore; private final StringFlag jvmGCOptionsFlag; - private final boolean allowDisableMtls; public Properties(ApplicationId applicationId, ConfigserverConfig configserverConfig, @@ -331,8 +329,6 @@ public class ModelContextImpl implements ModelContext { this.secretStore = secretStore; this.jvmGCOptionsFlag = PermanentFlags.JVM_GC_OPTIONS.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()); - this.allowDisableMtls = PermanentFlags.ALLOW_DISABLE_MTLS.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override public ModelContext.FeatureFlags featureFlags() { return featureFlags; } @@ -396,10 +392,6 @@ public class ModelContextImpl implements ModelContext { return flagValueForClusterType(jvmGCOptionsFlag, clusterType); } - @Override - public boolean allowDisableMtls() { - return allowDisableMtls; - } public String flagValueForClusterType(StringFlag flag, Optional<ClusterSpec.Type> clusterType) { return clusterType.map(type -> flag.with(CLUSTER_TYPE, type.name())) |