From 2a985f9aa08b724aa17696abe270888d1fffe755 Mon Sep 17 00:00:00 2001 From: bjormel Date: Mon, 18 Sep 2023 10:29:24 +0000 Subject: Use getConfigServerVipUri, not getConfigServerYcpiUri --- .../vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java | 4 +++- .../controller/restapi/configserver/ConfigServerApiHandler.java | 2 +- .../yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'controller-server/src/main') 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); } -- cgit v1.2.3