diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-12-19 15:13:06 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-12-19 15:13:06 +0100 |
| commit | 26bc03248dd4340b1d9e62317fd7f42c8a91e48b (patch) | |
| tree | 384df48f3141034d4cee19958c32eab4e5afd56a /node-repository | |
| parent | 334a19f4af148556356c7b955cf1d97a956785ad (diff) | |
GC dead code
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 5 |
1 files changed, 1 insertions, 4 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 b2db5977109..c78ad2b0da6 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 @@ -91,10 +91,7 @@ public class CapacityPolicies { } public NodeResources specifyFully(NodeResources resources, ClusterSpec clusterSpec, ApplicationId applicationId) { - NodeResources amended = resources.withUnspecifiedFieldsFrom(defaultResources(clusterSpec, applicationId).with(DiskSpeed.any)); - // TODO jonmv: remove this after all apps are 8.248.8 or above; architecture for admin nodes was not picked up before this. - if (clusterSpec.vespaVersion().isBefore(Version.fromString("8.248.8"))) amended = amended.with(resources.architecture()); - return amended; + return resources.withUnspecifiedFieldsFrom(defaultResources(clusterSpec, applicationId).with(DiskSpeed.any)); } private NodeResources defaultResources(ClusterSpec clusterSpec, ApplicationId applicationId) { |