Revert "Merge pull request #13125 from vespa-engine/revert-13114-bratseth/allow-non-allocatable-limits"

This reverts commit f3c67d39861da9138f2948998435d502008442c8, reversing
changes made to 48ff6fe2efd6901796a9b8a0ceb8161232bcea15.

2 files changed, 4 insertions, 0 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
index 11ae0845fb0..9aaf0d365cd 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
@@ -37,6 +37,8 @@ public class ClusterResources {
     public boolean smallerThan(ClusterResources other) {
         if (this.nodes < other.nodes) return true;
         if (this.groups < other.groups) return true;
+        if (this.nodeResources.isUnspecified() || other.nodeResources.isUnspecified()) return false;
+
         if ( ! this.nodeResources.justNumbers().satisfies(other.nodeResources.justNumbers())) return true;
         return false;
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index 05b604b263f..bed36d0d5d2 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -241,6 +241,8 @@ public class NodeResources {
         return true;
     }
 
+    public boolean isUnspecified() { return this == unspecified; }
+
     /**
      * Create this from serial form.
      *