diff options
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 48449780b18..e790d77a660 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -281,7 +281,7 @@ public class ModelContextImpl implements ModelContext { this.athenzDomain = athenzDomain; this.applicationRoles = applicationRoles; this.quota = maybeQuota.orElseGet(Quota::unlimited); - this.dedicatedClusterControllerCluster = List.of(Environment.staging, Environment.perf, Environment.prod).contains(zone.environment()) && dedicatedClusterControllerCluster; + this.dedicatedClusterControllerCluster = zoneHasRedundancyOrIsCD(zone) && dedicatedClusterControllerCluster; jvmGcOptions = flagValue(flagSource, applicationId, PermanentFlags.JVM_GC_OPTIONS); } @@ -349,4 +349,9 @@ public class ModelContextImpl implements ModelContext { } } + private static boolean zoneHasRedundancyOrIsCD(Zone zone) { + return zone.system().isCd() && zone.environment() == Environment.dev + || List.of(Environment.staging, Environment.perf, Environment.prod).contains(zone.environment()); + } + } |