1 files changed, 16 insertions, 24 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 0c2c3c48df1..2b9c5396724 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
+import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.NodeResources;
@@ -29,10 +30,21 @@ public class CapacityPolicies {
         this.sharedHosts = type -> PermanentFlags.SHARED_HOST.bindTo(nodeRepository.flagSource()).value().isEnabled(type.name());
     }
 
-    public int decideSize(int requested, boolean required, boolean canFail, boolean isTester, ClusterSpec cluster) {
+    public Capacity applyOn(Capacity capacity, ApplicationId application) {
+        return capacity.withLimits(applyOn(capacity.minResources(), capacity, application),
+                                   applyOn(capacity.maxResources(), capacity, application));
+    }
+
+    private ClusterResources applyOn(ClusterResources resources, Capacity capacity, ApplicationId application) {
+        int nodes = decideSize(resources.nodes(), capacity.isRequired(), application.instance().isTester());
+        int groups = Math.min(resources.groups(), nodes); // cannot have more groups than nodes
+        var nodeResources = decideNodeResources(resources.nodeResources(), capacity.isRequired());
+        return new ClusterResources(nodes, groups, nodeResources);
+    }
+
+    private int decideSize(int requested, boolean required, boolean isTester) {
         if (isTester) return 1;
 
-        ensureRedundancy(requested, cluster, canFail);
         if (required) return requested;
         switch(zone.environment()) {
             case dev : case test : return 1;
@@ -43,10 +55,7 @@ public class CapacityPolicies {
         }
     }
 
-    public NodeResources decideNodeResources(NodeResources target, boolean required, ClusterSpec cluster) {
-        if (target.isUnspecified())
-            target = defaultNodeResources(cluster.type());
-
+    private NodeResources decideNodeResources(NodeResources target, boolean required) {
         if (required) return target;
 
         // Dev does not cap the cpu or network of containers since usage is spotty: Allocate just a small amount exclusively
@@ -77,28 +86,11 @@ public class CapacityPolicies {
     }
 
     /**
-     * Whether or not the nodes requested can share physical host with other applications.
+     * Returns whether the nodes requested can share physical host with other applications.
      * A security feature which only makes sense for prod.
      */
     public boolean decideExclusivity(Capacity capacity, boolean requestedExclusivity) {
         return requestedExclusivity && (capacity.isRequired() || zone.environment() == Environment.prod);
     }
 
-    /**
-     * Throw if the node count is 1 for container and content clusters and we're in a production zone
-     *
-     * @throws IllegalArgumentException if only one node is requested and we can fail
-     */
-    private void ensureRedundancy(int nodeCount, ClusterSpec cluster, boolean canFail) {
-        if (canFail &&
-            nodeCount == 1 &&
-            requiresRedundancy(cluster.type()) &&
-            zone.environment().isProduction())
-            throw new IllegalArgumentException("Deployments to prod require at least 2 nodes per cluster for redundancy. Not fulfilled for " + cluster);
-    }
-
-    private static boolean requiresRedundancy(ClusterSpec.Type clusterType) {
-        return clusterType.isContent() || clusterType.isContainer();
-    }
-
 }