Mark old endpoints as legacy if generated exist

4 files changed, 17 insertions, 13 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index b1ffce65852..90c4a506f10 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -197,19 +197,22 @@ public class RoutingController {
     /** Returns the zone- and region-scoped endpoints of given deployment */
     public EndpointList endpointsOf(DeploymentId deployment, ClusterSpec.Id cluster, GeneratedEndpointList generatedEndpoints) {
         requireGeneratedEndpoints(generatedEndpoints, false);
+        boolean generatedEndpointsAvailable = !generatedEndpoints.isEmpty();
         boolean tokenSupported = !generatedEndpoints.authMethod(AuthMethod.token).isEmpty();
-        RoutingMethod routingMethod = controller.zoneRegistry().routingMethod(deployment.zoneId());
         boolean isProduction = deployment.zoneId().environment().isProduction();
+        RoutingMethod routingMethod = controller.zoneRegistry().routingMethod(deployment.zoneId());
         List<Endpoint> endpoints = new ArrayList<>();
         Endpoint.EndpointBuilder zoneEndpoint = Endpoint.of(deployment.applicationId())
                                                         .routingMethod(routingMethod)
                                                         .on(Port.fromRoutingMethod(routingMethod))
+                                                        .legacy(generatedEndpointsAvailable)
                                                         .target(cluster, deployment);
         endpoints.add(zoneEndpoint.in(controller.system()));
         ZoneApi zone = controller.zoneRegistry().zones().all().get(deployment.zoneId()).get();
         Endpoint.EndpointBuilder regionEndpoint = Endpoint.of(deployment.applicationId())
                                                           .routingMethod(routingMethod)
                                                           .on(Port.fromRoutingMethod(routingMethod))
+                                                          .legacy(generatedEndpointsAvailable)
                                                           .targetRegion(cluster,
                                                                         zone.getCloudNativeRegionName(),
                                                                         zone.getCloudName());
@@ -226,12 +229,14 @@ public class RoutingController {
             };
             if (include) {
                 endpoints.add(zoneEndpoint.generatedFrom(generatedEndpoint)
+                                          .legacy(false)
                                           .authMethod(generatedEndpoint.authMethod())
                                           .in(controller.system()));
                 // Only a single region endpoint is needed, not one per auth method
                 if (isProduction && generatedEndpoint.authMethod() == AuthMethod.mtls) {
                     GeneratedEndpoint weightedGeneratedEndpoint = generatedEndpoint.withClusterPart(weightedClusterPart(cluster, deployment));
                     endpoints.add(regionEndpoint.generatedFrom(weightedGeneratedEndpoint)
+                                                .legacy(false)
                                                 .authMethod(AuthMethod.none)
                                                 .in(controller.system()));
                 }
@@ -257,6 +262,7 @@ public class RoutingController {
         var endpoints = new ArrayList<Endpoint>();
         var directMethods = 0;
         var availableRoutingMethods = routingMethodsOfAll(deployments);
+        boolean generatedEndpointsAvailable = !generatedEndpoints.isEmpty();
         for (var method : availableRoutingMethods) {
             if (method.isDirect() && ++directMethods > 1) {
                 throw new IllegalArgumentException("Invalid routing methods for " + routingId + ": Exceeded maximum " +
@@ -265,10 +271,11 @@ public class RoutingController {
             Endpoint.EndpointBuilder builder = Endpoint.of(routingId.instance())
                                                        .target(routingId.endpointId(), cluster, deployments)
                                                        .on(Port.fromRoutingMethod(method))
+                                                       .legacy(generatedEndpointsAvailable)
                                                        .routingMethod(method);
             endpoints.add(builder.in(controller.system()));
             for (var ge : generatedEndpoints) {
-                endpoints.add(builder.generatedFrom(ge).authMethod(ge.authMethod()).in(controller.system()));
+                endpoints.add(builder.generatedFrom(ge).legacy(false).authMethod(ge.authMethod()).in(controller.system()));
             }
         }
         return filterEndpoints(routingId.instance(), EndpointList.copyOf(endpoints));
@@ -280,16 +287,18 @@ public class RoutingController {
         requireGeneratedEndpoints(generatedEndpoints, true);
         ZoneId zone = deployments.keySet().iterator().next().zoneId(); // Where multiple zones are possible, they all have the same routing method.
         RoutingMethod routingMethod = usesSharedRouting(zone) ? RoutingMethod.sharedLayer4 : RoutingMethod.exclusive;
+        boolean generatedEndpointsAvailable = !generatedEndpoints.isEmpty();
         Endpoint.EndpointBuilder builder = Endpoint.of(application)
                                                    .targetApplication(endpoint,
                                                                       cluster,
                                                                       deployments)
                                                    .routingMethod(routingMethod)
+                                                   .legacy(generatedEndpointsAvailable)
                                                    .on(Port.fromRoutingMethod(routingMethod));
         List<Endpoint> endpoints = new ArrayList<>();
         endpoints.add(builder.in(controller.system()));
         for (var ge : generatedEndpoints) {
-            endpoints.add(builder.generatedFrom(ge).authMethod(ge.authMethod()).in(controller.system()));
+            endpoints.add(builder.generatedFrom(ge).legacy(false).authMethod(ge.authMethod()).in(controller.system()));
         }
         return EndpointList.copyOf(endpoints);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
index 5c6611f80c3..2c13a7ddb11 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
@@ -122,7 +122,7 @@ public class Endpoint {
         return scope;
     }
 
-    /** Returns whether this is considered a legacy DNS name that is due for removal */
+    /** Returns whether this is considered a legacy DNS name intended to be removed at some point */
     public boolean legacy() {
         return legacy;
     }
@@ -557,9 +557,9 @@ public class Endpoint {
             return this;
         }
 
-        /** Marks this as a legacy endpoint */
-        public EndpointBuilder legacy() {
-            this.legacy = true;
+        /** Set whether this is a legacy endpoint */
+        public EndpointBuilder legacy(boolean legacy) {
+            this.legacy = legacy;
             return this;
         }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
index 310a78e45f0..6e8cd16336a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
@@ -28,11 +28,6 @@ public class EndpointList extends AbstractFilteringList<Endpoint, EndpointList>
         }
     }
 
-    /** Returns the primary (non-legacy) endpoint, if any */
-    public Optional<Endpoint> primary() {
-        return not().legacy().asList().stream().findFirst();
-    }
-
     /** Returns the subset of endpoints named according to given ID and scope */
     public EndpointList named(EndpointId id, Endpoint.Scope scope) {
         return matching(endpoint -> endpoint.scope() == scope && // ID is only unique within a scope
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 16d862a66ef..223fb45dd38 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2223,7 +2223,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         Cursor array = slime.setObject().setArray("globalrotationoverride");
         Optional<Endpoint> primaryEndpoint = controller.routing().readDeclaredEndpointsOf(deploymentId.applicationId())
                                                        .requiresRotation()
-                                                       .primary();
+                                                       .first();
         if (primaryEndpoint.isPresent()) {
             DeploymentRoutingContext context = controller.routing().of(deploymentId);
             RoutingStatus status = context.routingStatus();