From 988adedfb5405f121d8d3842c76ba67db90eacc9 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Sat, 17 Aug 2024 09:54:49 +0200 Subject: [PATCH] Revert "Don't populate externalId from ckms when building the config model" --- .../yahoo/vespa/config/server/deploy/ModelContextImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 715085c2dcd1..44d267abeb59 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 @@ -25,15 +25,18 @@ import com.yahoo.config.provision.DataplaneToken; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeResources.Architecture; import com.yahoo.config.provision.SharedHosts; 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.Dimension; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.flags.StringFlag; +import com.yahoo.vespa.flags.UnboundFlag; import java.io.File; import java.net.URI; @@ -43,6 +46,7 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutorService; +import java.util.function.Predicate; import static com.yahoo.vespa.config.server.ConfigServerSpec.fromConfig; import static com.yahoo.vespa.flags.Dimension.CLUSTER_TYPE; @@ -450,7 +454,7 @@ public String athenzDnsSuffix() { @Override public List tenantSecretStores() { - return tenantSecretStores; + return SecretStoreExternalIdRetriever.populateExternalId(secretStore, applicationId.tenant(), zone.system(), tenantSecretStores); } @Override public String jvmGCOptions(Optional clusterType) {