From b96fff9a225e8581cfa8e2208a8a361c2aa69058 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 16 Aug 2024 11:13:58 +0200 Subject: [PATCH] Don't populate externalId from ckms when building the config model - It is always present in DeployState.Properties (from zk) --- .../yahoo/vespa/config/server/deploy/ModelContextImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 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 44d267abeb59..715085c2dcd1 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,18 +25,15 @@ 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; @@ -46,7 +43,6 @@ 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; @@ -454,7 +450,7 @@ public String athenzDnsSuffix() { @Override public List tenantSecretStores() { - return SecretStoreExternalIdRetriever.populateExternalId(secretStore, applicationId.tenant(), zone.system(), tenantSecretStores); + return tenantSecretStores; } @Override public String jvmGCOptions(Optional clusterType) {