Merge pull request #13608 from vespa-engine/revert-13593-mpolden/support-legacy-syntax

Revert "Create global routing policy with legacy syntax"

2 files changed, 1 insertions, 26 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index 9678c42d31f..abd4770ea0d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -289,16 +289,12 @@ public class RoutingPolicies {
             if (instanceSpec.isEmpty()) {
                 return Set.of();
             }
-            if (instanceSpec.get().globalServiceId().filter(id -> id.equals(loadBalancer.cluster().value())).isPresent()) {
-                // Legacy assignment always has the default endpoint Id
-                return Set.of(EndpointId.defaultId());
-            }
             return instanceSpec.get().endpoints().stream()
                                .filter(endpoint -> endpoint.containerId().equals(loadBalancer.cluster().value()))
                                .filter(endpoint -> endpoint.regions().contains(deployment.zoneId().region()))
                                .map(com.yahoo.config.application.api.Endpoint::endpointId)
                                .map(EndpointId::of)
-                               .collect(Collectors.toUnmodifiableSet());
+                               .collect(Collectors.toSet());
         }
 
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index a026a3c75a2..56fb7194e4e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -138,27 +138,6 @@ public class RoutingPoliciesTest {
     }
 
     @Test
-    public void global_routing_policies_legacy_global_service_id() {
-        var tester = new RoutingPoliciesTester();
-        var context = tester.newDeploymentContext("tenant1", "app1", "default");
-        int clustersPerZone = 2;
-        int numberOfDeployments = 2;
-        var applicationPackage = applicationPackageBuilder()
-                .region(zone1.region())
-                .region(zone2.region())
-                .globalServiceId("c0")
-                .build();
-        tester.provisionLoadBalancers(clustersPerZone, context.instanceId(), zone1, zone2);
-
-        // Creates alias records
-        context.submit(applicationPackage).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
-        tester.assertTargets(context.instanceId(), EndpointId.defaultId(), 0, zone1, zone2);
-        assertEquals("Routing policy count is equal to cluster count",
-                     numberOfDeployments * clustersPerZone,
-                     tester.policiesOf(context.instance().id()).size());
-    }
-
-    @Test
     public void zone_routing_policies() {
         zone_routing_policies(false);
         zone_routing_policies(true);