Merge pull request #16451 from vespa-engine/mpolden/schedule-os-upgrades

Schedule OS upgrades automatically in supported clouds

2 files changed, 1 insertions, 15 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
index 5e54f09f7a3..55ee0fc9708 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
@@ -34,7 +34,6 @@ import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner;
 import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner.HostSharing;
 import com.yahoo.vespa.hosted.provision.provisioning.NodeCandidate;
 import com.yahoo.vespa.hosted.provision.provisioning.NodePrioritizer;
-import com.yahoo.vespa.hosted.provision.provisioning.NodeResourceComparator;
 import com.yahoo.vespa.hosted.provision.provisioning.NodeSpec;
 import com.yahoo.vespa.hosted.provision.provisioning.ProvisionedHost;
 import com.yahoo.yolean.Exceptions;
@@ -53,7 +52,6 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 /**
  * @author freva
@@ -317,18 +315,6 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer {
                 clusterCapacity.bandwidthGbps());
     }
 
-    /** Reads node resources declared by target capacity flag */
-    private List<NodeResources> targetCapacity() {
-        return preprovisionCapacityFlag.value().stream()
-                .flatMap(cap -> {
-                    NodeResources resources = new NodeResources(cap.vcpu(), cap.memoryGb(),
-                            cap.diskGb(), cap.bandwidthGbps());
-                    return IntStream.range(0, cap.count()).mapToObj(i -> resources);
-                })
-                .sorted(NodeResourceComparator.memoryDiskCpuOrder().reversed())
-                .collect(Collectors.toList());
-    }
-
     /** Verify DNS configuration of given nodes */
     private void verifyDns(List<Node> nodes) {
         for (var node : nodes) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index cd381b467d4..3fbc7b213a1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -91,7 +91,7 @@ public class GroupPreparer {
             if (nodeRepository.zone().getCloud().dynamicProvisioning()) {
                 final Version osVersion;
                 if (allocateOsRequirement.equals("rhel8")) {
-                    osVersion = new Version(8);
+                    osVersion = new Version(8, Integer.MAX_VALUE /* always use latest 8 version */, 0);
                 } else {
                     osVersion = nodeRepository.osVersions().targetFor(NodeType.host).orElse(Version.emptyVersion);
                 }