Merge pull request #13926 from vespa-engine/mpolden/global-endpoint-cluster

Expose the target cluster of an global endpoint in application API

1 files changed, 2 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
index 7f4a707949b..337e2b897f1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
@@ -74,12 +74,12 @@ public class RoutingPolicy {
         Optional<Endpoint> infraEndpoint = SystemApplication.matching(id.owner())
                                                             .flatMap(app -> app.endpointIn(id.zone(), zoneRegistry));
         if (infraEndpoint.isPresent()) return infraEndpoint.get();
-        return endpoint(routingMethod).in(system);
+        return endpoint(routingMethod).target(id.cluster(), id.zone()).in(system);
     }
 
     /** Returns the weighted endpoint of this */
     public Endpoint weightedEndpointIn(SystemName system, RoutingMethod routingMethod) {
-        return endpoint(routingMethod).weighted().in(system);
+        return endpoint(routingMethod).weighted(id.cluster(), id.zone()).in(system);
     }
 
     @Override
@@ -104,7 +104,6 @@ public class RoutingPolicy {
 
     private Endpoint.EndpointBuilder endpoint(RoutingMethod routingMethod) {
         return Endpoint.of(id.owner())
-                       .target(id.cluster(), id.zone())
                        .on(Port.fromRoutingMethod(routingMethod))
                        .routingMethod(routingMethod);
     }