summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2023-07-07 14:02:52 +0200
committerGitHub <noreply@github.com>2023-07-07 14:02:52 +0200
commit4777126d6aa2095732a5225e1c3114869c7d82a1 (patch)
treed19f96ec007158a2d1a3c41174660f38291deb81 /node-repository
parent934cf55bc46b22c5da88d758d63873e69a6c916e (diff)
parenta463215951a79aaad74cef73dfcfdb1e0961e800 (diff)
Merge pull request #27706 from vespa-engine/hmusum/revert-hmusum/less-memory-for-default-node-resourcesw-in-dev-cd
Revert: Less memory for default node resources in dev cd zone
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java6
1 files changed, 1 insertions, 5 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 bfd06d744f6..8a39f309935 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
@@ -9,11 +9,11 @@ import com.yahoo.config.provision.ClusterResources;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.NodeResources;
-import com.yahoo.config.provision.SystemName;
import com.yahoo.config.provision.Zone;
import com.yahoo.vespa.flags.PermanentFlags;
import com.yahoo.vespa.flags.StringFlag;
import com.yahoo.vespa.hosted.provision.NodeRepository;
+
import java.util.Map;
import java.util.TreeMap;
@@ -115,10 +115,6 @@ public class CapacityPolicies {
return versioned(clusterSpec, Map.of(new Version(0), smallestSharedResources())).with(architecture);
}
- if (zone.environment() == Environment.dev && zone.system() == SystemName.cd) {
- return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(1.5, 4, 50, 0.3)));
- }
-
if (clusterSpec.type() == ClusterSpec.Type.content) {
return zone.cloud().dynamicProvisioning()
? versioned(clusterSpec, Map.of(new Version(0), new NodeResources(2, 16, 300, 0.3)))