Use dedicated CC in all CD zones
@@ -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,8 @@ public class ModelContextImpl implements ModelContext {
}
}
+ private static boolean zoneHasRedundancyOrIsCD(Zone zone) {
+ return zone.system().isCd() || List.of(Environment.staging, Environment.perf, Environment.prod).contains(zone.environment());
+ }
+
}
