diff options
| author | bjormel <bjormel@yahooinc.com> | 2023-09-18 10:29:24 +0000 |
|---|---|---|
| committer | leandroalves <leandroalves@yahooinc.com> | 2023-09-20 09:08:56 +0200 |
| commit | 09fa0d4a93c8e3d633705d5dc55f2f5d3f69b3c2 (patch) | |
| tree | 5db84758a6704d34f19cd3c459dd64a69d32e9be /controller-api/src/main/java/com | |
| parent | 1067b50db94328d83ca0a185176225ee266aca72 (diff) | |
Use getConfigServerVipUri, not getConfigServerYcpiUri
Diffstat (limited to 'controller-api/src/main/java/com')
2 files changed, 2 insertions, 5 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 3b047e3fd28..2e247f60778 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 @@ -59,9 +59,7 @@ public interface ZoneRegistry { ZoneApi get(ZoneId zoneId); /** Returns the URI for the config server VIP in the given zone */ - URI getConfigServerVipUri(ZoneId zoneId); - - URI getConfigServerYcpiUri(ZoneId zoneId); + URI getConfigServerVipUri(ZoneId zoneId, boolean publiclyReachable); /** Returns the VIP hostname for the shared routing layer in given zone, if any */ Optional<String> getVipHostname(ZoneId zoneId); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java index f9b76f342af..7a84aecff5b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java @@ -70,8 +70,7 @@ public interface FlagsTarget { return new ConfigServerFlagsTarget(registry.system(), zone.getCloudName(), zone.getVirtualId(), - zone.getCloudName().equals(CloudName.YAHOO) ? registry.getConfigServerYcpiUri(zone.getVirtualId()) - : registry.getConfigServerVipUri(zone.getVirtualId()), + registry.getConfigServerVipUri(zone.getVirtualId(), zone.getCloudName().equals(CloudName.AWS)), registry.getConfigServerHttpsIdentity(zone.getVirtualId())); } |