summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2019-07-18 17:00:22 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2019-07-18 17:00:22 +0200
commit094fa05c0eaae2b302cf6f35b4c68b08b2172fd0 (patch)
treebc84674438026ca6db77906b8def69d06d844bdd /controller-api
parent2b7a2ac21fd15eaaf5defc6a87f76531fd435a9e (diff)
Make AthenzDomain for the system available from ZoneRegistry
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index db9291cd651..d8c8bfcd70e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -2,6 +2,7 @@
package com.yahoo.vespa.hosted.controller.api.integration.zone;
import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.AthenzDomain;
import com.yahoo.config.provision.CloudName;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.RegionName;
@@ -10,7 +11,6 @@ import com.yahoo.config.provision.zone.UpgradePolicy;
import com.yahoo.config.provision.zone.ZoneFilter;
import com.yahoo.config.provision.zone.ZoneId;
import com.yahoo.vespa.athenz.api.AthenzIdentity;
-import com.yahoo.vespa.athenz.api.AthenzService;
import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
@@ -56,6 +56,9 @@ public interface ZoneRegistry {
/** Return the configserver's Athenz service identity */
AthenzIdentity getConfigServerAthenzIdentity(ZoneId zoneId);
+ /** Return the system Athenz domain */
+ AthenzDomain getSystemAthenzDomain();
+
/** Returns the Vespa upgrade policy to use for zones in this registry */
UpgradePolicy upgradePolicy();