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-server/src/main | |
| parent | 1067b50db94328d83ca0a185176225ee266aca72 (diff) | |
Use getConfigServerVipUri, not getConfigServerYcpiUri
Diffstat (limited to 'controller-server/src/main')
3 files changed, 5 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index a2611fe3f9d..c4f0800a8f1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -4,6 +4,8 @@ package com.yahoo.vespa.hosted.controller.proxy; import ai.vespa.util.http.hc4.SslConnectionSocketFactory; import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; +import com.yahoo.config.provision.CloudName; +import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.jdisc.http.HttpRequest.Method; import com.yahoo.text.Text; import com.yahoo.vespa.athenz.api.AthenzIdentity; @@ -277,7 +279,7 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C public ConnectionReuseStrategy(ZoneRegistry zoneRegistry) { this(zoneRegistry.zones().all().ids().stream() - .map(zoneRegistry::getConfigServerVipUri) + .map((ZoneId zoneId) -> zoneRegistry.getConfigServerVipUri(zoneId, zoneRegistry.systemZone().getCloudName().equals(CloudName.AWS))) .map(URI::getHost) .collect(Collectors.toUnmodifiableSet())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java index 1bcc99b9612..14223b49abc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java @@ -123,7 +123,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler { private URI getEndpoint(ZoneId zoneId) { if (controllerZone.equals(zoneId)) return CONTROLLER_URI; - return controllerCloud.equals(CloudName.AWS) ? zoneRegistry.getConfigServerYcpiUri(zoneId) : zoneRegistry.getConfigServerVipUri(zoneId); + return zoneRegistry.getConfigServerVipUri(zoneId, controllerCloud.equals(CloudName.AWS)); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java index be7d86dd535..89a2067837b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java @@ -101,8 +101,7 @@ public class ZoneApiHandler extends AuditLoggingRequestHandler { } private ProxyRequest proxyRequest(ZoneId zoneId, HttpURL.Path path, HttpRequest request) { - return ProxyRequest.tryOne(zoneRegistry.systemZone().getCloudName().equals(CloudName.AWS) ? zoneRegistry.getConfigServerYcpiUri(zoneId) - : zoneRegistry.getConfigServerVipUri(zoneId), + return ProxyRequest.tryOne(zoneRegistry.getConfigServerVipUri(zoneId, zoneRegistry.systemZone().getCloudName().equals(CloudName.AWS)), path, request); } |