From d40f98811345927933de554970d89e9268ed7659 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Thu, 15 Jun 2023 14:43:31 +0200 Subject: Include dataplane tokens on deploy --- .../controller/api/application/v4/model/DeploymentData.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java index 5a55768ad2c..b23b93cba78 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java @@ -10,6 +10,7 @@ import com.yahoo.vespa.athenz.api.AthenzDomain; import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ContainerEndpoint; +import com.yahoo.vespa.hosted.controller.api.integration.dataplanetoken.DataplaneTokenVersions; import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretStore; import com.yahoo.yolean.concurrent.Memoized; @@ -42,6 +43,7 @@ public class DeploymentData { private final List tenantSecretStores; private final List operatorCertificates; private final Supplier> cloudAccount; + private final List dataPlaneTokens; private final boolean dryRun; public DeploymentData(ApplicationId instance, ZoneId zone, Supplier applicationPackage, Version platform, @@ -53,6 +55,7 @@ public class DeploymentData { List tenantSecretStores, List operatorCertificates, Supplier> cloudAccount, + List dataPlaneTokens, boolean dryRun) { this.instance = requireNonNull(instance); this.zone = requireNonNull(zone); @@ -66,6 +69,7 @@ public class DeploymentData { this.tenantSecretStores = List.copyOf(requireNonNull(tenantSecretStores)); this.operatorCertificates = List.copyOf(requireNonNull(operatorCertificates)); this.cloudAccount = new Memoized<>(requireNonNull(cloudAccount)); + this.dataPlaneTokens = dataPlaneTokens; this.dryRun = dryRun; } @@ -117,6 +121,10 @@ public class DeploymentData { return cloudAccount.get(); } + public List dataPlaneTokens() { + return dataPlaneTokens; + } + public boolean isDryRun() { return dryRun; } -- cgit v1.2.3