Only include zone-scoped endpoints if feature flag is set

2 files changed, 3 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index de3e29386c9..cc7d1e6070d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -566,7 +566,8 @@ public class ApplicationController {
     }
 
     private PreparedEndpoints prepareEndpoints(DeploymentId deployment, JobId job, LockedApplication application,
-                                               ApplicationPackageStream applicationPackage, Consumer<String> deployLogger) {
+                                               ApplicationPackageStream applicationPackage,
+                                               Consumer<String> deployLogger) {
         Instance instance = application.get().require(job.application().instance());
         Tags tags = applicationPackage.truncatedPackage().deploymentSpec().instance(instance.name())
                                       .map(DeploymentInstanceSpec::tags)
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 cc6195c075d..546e8afd5c4 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
@@ -130,7 +130,7 @@ public class RoutingController {
 
         // Add zone-scoped endpoints
         final GeneratedEndpoints generatedEndpoints;
-        if (!usesSharedRouting(deployment.zoneId())) { // TODO(mpolden): Remove this check when config models < 8.230 are gone
+        if (randomizedEndpointsEnabled(deployment.applicationId())) { // TODO(mpolden): Remove this guard once config-models < 8.220 are gone
             boolean includeTokenEndpoint = tokenEndpointEnabled(deployment.applicationId());
             Map<ClusterSpec.Id, List<GeneratedEndpoint>> generatedEndpointsByCluster = new HashMap<>();
             for (var container : services.containers()) {
@@ -145,7 +145,6 @@ public class RoutingController {
                 endpoints = endpoints.and(endpointsOf(deployment, clusterId, generatedForCluster).scope(Scope.zone));
             }
             generatedEndpoints = new GeneratedEndpoints(generatedEndpointsByCluster);
-
         } else {
             generatedEndpoints = GeneratedEndpoints.empty;
         }