diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-08 15:30:18 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-08 15:30:18 +0200 |
| commit | b798ac5044ecb49429ddccb8ab4335de80175f88 (patch) | |
| tree | 2be07c838acda55719703114ce2c084151ca5633 /controller-server | |
| parent | 35e024b57d8e719f627299688a02b446d1b1c1c9 (diff) | |
Use ZoneApi internally in UpgradePolicy
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java index 8818a441fbd..c14a454a447 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java @@ -42,7 +42,7 @@ public abstract class InfrastructureUpgrader extends Maintainer { /** Deploy a list of system applications until they converge on the given version */ private void upgradeAll(Version target, List<SystemApplication> applications) { - for (List<ZoneId> zones : upgradePolicy.asList()) { + for (List<ZoneId> zones : upgradePolicy.deprecatedAsList()) { boolean converged = true; for (ZoneId zone : zones) { try { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java index f9ce75d2297..b2c14f96a39 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java @@ -87,7 +87,7 @@ public class OsVersionStatus { private static List<ZoneId> zonesToUpgrade(Controller controller) { return controller.zoneRegistry().osUpgradePolicies().stream() - .flatMap(upgradePolicy -> upgradePolicy.asList().stream()) + .flatMap(upgradePolicy -> upgradePolicy.deprecatedAsList().stream()) .flatMap(Collection::stream) .collect(Collectors.toUnmodifiableList()); } |