Replace usage of deprecated method

1 files changed, 3 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
index c20904710ea..08fa3abcd9f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
@@ -102,10 +102,9 @@ public class Upgrader extends Maintainer {
         applications = applications.notFailingOn(version); // try to upgrade only if it hasn't failed on this version
         applications = applications.canUpgradeAt(controller().clock().instant()); // wait with applications that are currently blocking upgrades
         applications = applications.byIncreasingDeployedVersion(); // start with lowest versions
-        if (!containsOnlyCanaries(applications)) { // throttle upgrades of non-canaries
-            applications = applications.first(numberOfApplicationsToUpgrade());
-        }
-        for (Application application : applications.asList())
+        for (Application application : applications.with(UpgradePolicy.canary).asList())
+            controller().applications().deploymentTrigger().triggerChange(application.id(), Change.of(version));
+        for (Application application : applications.without(UpgradePolicy.canary).first(numberOfApplicationsToUpgrade()).asList())
             controller().applications().deploymentTrigger().triggerChange(application.id(), Change.of(version));
     }
 
@@ -173,9 +172,4 @@ public class Upgrader extends Maintainer {
         controller().removeConfidenceOverride(version::equals);
     }
 
-    /** Returns whether all given applications are canaries */
-    private static boolean containsOnlyCanaries(ApplicationList applications) {
-        return applications.asList().stream().allMatch(application -> application.deploymentSpec().upgradePolicy() == UpgradePolicy.canary);
-    }
-
 }