Merge pull request #27861 from vespa-engine/hmusum/simplify-default-node-resources

Simplify default node resources

1 files changed, 2 insertions, 13 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 8a39f309935..5ce5bc8abd0 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
@@ -98,10 +98,7 @@ public class CapacityPolicies {
             Architecture architecture = adminClusterArchitecture(applicationId);
 
             if (nodeRepository.exclusiveAllocation(clusterSpec)) {
-                var resources = legacySmallestExclusiveResources(); //TODO: use 8Gb as default when no apps are using 4Gb
-                return versioned(clusterSpec, Map.of(new Version(0), resources,
-                                                     new Version(8, 182, 12), resources.with(architecture),
-                                                     new Version(8, 187), smallestExclusiveResources().with(architecture)));
+                return smallestExclusiveResources().with(architecture);
             }
 
             if (clusterSpec.id().value().equals("cluster-controllers")) {
@@ -131,8 +128,7 @@ public class CapacityPolicies {
         // 1.32 fits floor(8/1.32) = 6 cluster controllers on each 8Gb host, and each will have
         // 1.32-(0.7+0.6)*(1.32/8) = 1.1 Gb real memory given current taxes.
         if (architecture == Architecture.x86_64)
-            return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(0.25, 1.14, 10, 0.3),
-                                                 new Version(8, 129, 4), new NodeResources(0.25, 1.32, 10, 0.3)));
+            return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(0.25, 1.32, 10, 0.3)));
         else
             // arm64 nodes need more memory
             return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(0.25, 1.50, 10, 0.3)));
@@ -159,13 +155,6 @@ public class CapacityPolicies {
     }
 
     // The lowest amount of resources that can be exclusive allocated (i.e. a matching host flavor for this exists)
-    private NodeResources legacySmallestExclusiveResources() {
-        return (zone.cloud().name().equals(CloudName.GCP))
-               ? new NodeResources(1, 4, 50, 0.3)
-               : new NodeResources(0.5, 4, 50, 0.3);
-    }
-
-    // The lowest amount of resources that can be exclusive allocated (i.e. a matching host flavor for this exists)
     private NodeResources smallestExclusiveResources() {
         return (zone.cloud().name().equals(CloudName.GCP))
                 ? new NodeResources(2, 8, 50, 0.3)