summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-02-20 08:09:48 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-02-20 08:09:48 +0100
commite6b11430bd4058493be2b230167ba1cfe8b17106 (patch)
tree611bc68c1e97eb0c4cd55aa1377c517bcb9c5eed /configserver
parent1286ef91207958f16753c7ee325932a4f501ed55 (diff)
Only run migrator in perf,prod,staging, and only use dedicated there
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java3
1 files changed, 2 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 b661c16507f..48449780b18 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
@@ -20,6 +20,7 @@ import com.yahoo.config.model.api.Reindexing;
import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.AthenzDomain;
import com.yahoo.config.provision.DockerImage;
+import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.HostName;
import com.yahoo.config.provision.TenantName;
import com.yahoo.config.provision.Zone;
@@ -280,7 +281,7 @@ public class ModelContextImpl implements ModelContext {
this.athenzDomain = athenzDomain;
this.applicationRoles = applicationRoles;
this.quota = maybeQuota.orElseGet(Quota::unlimited);
- this.dedicatedClusterControllerCluster = dedicatedClusterControllerCluster;
+ this.dedicatedClusterControllerCluster = List.of(Environment.staging, Environment.perf, Environment.prod).contains(zone.environment()) && dedicatedClusterControllerCluster;
jvmGcOptions = flagValue(flagSource, applicationId, PermanentFlags.JVM_GC_OPTIONS);
}