Keep certification of future OS versions

2 files changed, 11 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/OsController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/OsController.java
index c426c27418d..58c3b4da5e4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/OsController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/OsController.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.hosted.controller.versions.OsVersionStatus;
 import com.yahoo.vespa.hosted.controller.versions.OsVersionTarget;
 
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
@@ -161,9 +162,12 @@ public record OsController(Controller controller) {
     /** Remove certifications for non-existent OS versions */
     public void removeStaleCertifications(OsVersionStatus currentStatus) {
         try (Mutex lock = curator().lockCertifiedOsVersions()) {
-            Set<OsVersion> knownVersions = currentStatus.versions().keySet();
+            Optional<OsVersion> minKnownVersion = currentStatus.versions().keySet().stream()
+                                                               .filter(v -> !v.version().isEmpty())
+                                                               .min(Comparator.naturalOrder());
+            if (minKnownVersion.isEmpty()) return;
             Set<CertifiedOsVersion> certifiedVersions = new HashSet<>(readCertified());
-            if (certifiedVersions.removeIf(cv -> !knownVersions.contains(cv.osVersion()))) {
+            if (certifiedVersions.removeIf(cv -> cv.osVersion().version().isBefore(minKnownVersion.get().version()))) {
                 curator().writeCertifiedOsVersions(certifiedVersions);
             }
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdaterTest.java
index af535abce26..6f4052bf0ef 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdaterTest.java
@@ -68,12 +68,14 @@ public class OsVersionStatusUpdaterTest {
                                                  .filter(osVersion -> !osVersion.version().isEmpty())
                                                  .collect(Collectors.toSet());
         List<OsVersion> versionsToCertify = new ArrayList<>(knownVersions);
-        versionsToCertify.addAll(List.of(new OsVersion(Version.fromString("95.0.1"), cloud),
-                                         new OsVersion(Version.fromString("98.0.2"), cloud)));
+        OsVersion futureVersion = new OsVersion(Version.fromString("98.0.2"), cloud); // Keep future version
+        versionsToCertify.addAll(List.of(new OsVersion(Version.fromString("3.11"), cloud),
+                                         futureVersion));
         for (OsVersion version : versionsToCertify) {
             tester.controller().os().certify(version.version(), version.cloud(), Version.fromString("1.2.3"));
         }
-        assertEquals(knownVersions.size() + 2, certifiedOsVersions(tester).size());
+        knownVersions.add(futureVersion);
+        assertEquals(knownVersions.size() + 1, certifiedOsVersions(tester).size());
         statusUpdater.maintain();
         assertEquals(knownVersions, certifiedOsVersions(tester));
     }