Avoid duplication when generating config and add test

1 files changed, 2 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index ab33c647d5f..4fc73de3b48 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -34,19 +34,12 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
 
     @Override
     public void getConfig(QrStartConfig.Builder builder) {
+        super.getConfig(builder);
         int maxHeapSize = featureFlags.clusterControllerMaxHeapSizeInMb();
         boolean verboseGc = (maxHeapSize < 512);
         builder.jvm
                 .verbosegc(verboseGc)
-                .availableProcessors(2)
-                .compressedClassSpaceSize(32)
-                .minHeapsize(32)
-                .heapsize(maxHeapSize)
-                .heapSizeAsPercentageOfPhysicalMemory(0)
-                .gcopts(getJvmGCOptions().orElse(G1GC));
-        if (getEnvironmentVars() != null) {
-            builder.qrs.env(getEnvironmentVars());
-        }
+                .heapsize(maxHeapSize);
     }
 
     public ReindexingContext reindexingContext() { return reindexingContext; }