diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-10-25 12:29:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 12:29:23 +0200 |
| commit | 8714fb78ce189089d7aa6438f7b0c875553366f3 (patch) | |
| tree | 7cb062751f1feb093752785ed398f39c46390886 /controller-server | |
| parent | 028c06b93e596350912caacc7493c84a66ecb687 (diff) | |
| parent | 7be06f53885a0d57028e91abdc70712fb9829b93 (diff) | |
Merge pull request #7444 from vespa-engine/mpolden/controller-acls
Support ACLs for controllers and hosts
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java index 366be35fe15..cd063e8e14b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java @@ -192,7 +192,7 @@ public class Application { /** Returns the global rotation dns name, if present */ public Optional<GlobalDnsName> globalDnsName(SystemName system) { - return rotation.map(rotation -> new GlobalDnsName(id, rotation, system)); + return rotation.map(ignored -> new GlobalDnsName(id, system)); } /** Returns the status of the global rotation assigned to this. Wil be empty if this does not have a global rotation. */ @@ -205,7 +205,6 @@ public class Application { // Rotation status only contains VIP host names, one per zone in the system. The only way to map VIP hostname to // this deployment, and thereby determine rotation status, is to check if VIP hostname contains the // deployment's environment and region. - // TODO: change this map to be indexed by zones, then? return rotationStatus.entrySet().stream() .filter(kv -> kv.getKey().value().contains(deployment.zone().value())) .map(Map.Entry::getValue) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java index 18ec15d35ac..91406bdb941 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.application; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.SystemName; -import com.yahoo.vespa.hosted.controller.rotation.RotationId; import java.net.URI; @@ -24,7 +23,7 @@ public class GlobalDnsName { private final URI secureUrl; private final URI oathUrl; - public GlobalDnsName(ApplicationId application, RotationId id, SystemName system) { + public GlobalDnsName(ApplicationId application, SystemName system) { this.url = URI.create(String.format("http://%s%s.%s.%s:%d/", getSystemPart(system, "."), sanitize(application.application().value()), |