From 2c4ea0a81062c3effa25ec42d44d0fc86adb1980 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 7 Feb 2022 12:09:52 +0100 Subject: - Adde featureflag for controlling environment variables. - Use general environment mechanism for existing ad-hoc environment variables. --- .../com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configserver') 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 056ca4b6c0d..547494efcba 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 @@ -357,6 +357,7 @@ public class ModelContextImpl implements ModelContext { private final List operatorCertificates; private final List tlsCiphersOverride; private final List zoneDnsSuffixes; + private final List environmentVariables; public Properties(ApplicationId applicationId, ConfigserverConfig configserverConfig, @@ -389,13 +390,15 @@ public class ModelContextImpl implements ModelContext { this.tenantSecretStores = tenantSecretStores; this.secretStore = secretStore; this.jvmGCOptionsFlag = PermanentFlags.JVM_GC_OPTIONS.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()); + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()); this.allowDisableMtls = PermanentFlags.ALLOW_DISABLE_MTLS.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.operatorCertificates = operatorCertificates; this.tlsCiphersOverride = PermanentFlags.TLS_CIPHERS_OVERRIDE.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.zoneDnsSuffixes = configserverConfig.zoneDnsSuffixes(); + this.environmentVariables = PermanentFlags.ENVIRONMENT_VARIABLES.bindTo(flagSource) + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override public ModelContext.FeatureFlags featureFlags() { return featureFlags; } @@ -477,6 +480,9 @@ public class ModelContextImpl implements ModelContext { .value(); } + @Override + public List environmentVariables() { return environmentVariables; } + } } -- cgit v1.2.3