diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-12 09:57:19 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-13 11:15:49 +0200 |
| commit | 8ca1d668c6fec3525b1328435ec882b4f2f2afe5 (patch) | |
| tree | d79c7beccc9e4f8501236340c16e49187a434678 /controller-server | |
| parent | c7d8f1d90ff8904e5449f62c3482a93d1dc8049f (diff) | |
Remove ZMS/Athens client without principal
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java index dcb54f13e4b..68912ac55ef 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java @@ -15,6 +15,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.Property; import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId; import com.yahoo.vespa.hosted.controller.api.integration.MetricsService; import com.yahoo.vespa.hosted.controller.api.integration.athens.Athens; +import com.yahoo.vespa.hosted.controller.api.integration.athens.ZmsClient; import com.yahoo.vespa.hosted.controller.api.integration.chef.Chef; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerClient; import com.yahoo.vespa.hosted.controller.api.integration.cost.ApplicationCost; @@ -85,6 +86,7 @@ public class Controller extends AbstractComponent { private final MetricsService metricsService; private final Chef chefClient; private final Athens athens; + private final ZmsClient zmsClient; /** * Creates a controller @@ -140,6 +142,7 @@ public class Controller extends AbstractComponent { this.chefClient = chefClient; this.clock = clock; this.athens = athens; + this.zmsClient = athens.zmsClientFactory().createClientWithServicePrincipal(); applicationController = new ApplicationController(this, db, curator, rotationRepository, athens.zmsClientFactory(), nameService, configServerClient, routingGenerator, clock); @@ -154,7 +157,7 @@ public class Controller extends AbstractComponent { public ApplicationController applications() { return applicationController; } public List<AthensDomain> getDomainList(String prefix) { - return athens.unauthorizedZmsClient().getDomainList(prefix); + return zmsClient.getDomainList(prefix); } public Athens athens() { |