Allow upgrading proxies concurrently with proxyhosts

2 files changed, 9 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
index 56b7ffd01f9..9d909cb5ebf 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
@@ -29,7 +29,7 @@ public enum SystemApplication {
     configServerHost(InfrastructureApplication.CONFIG_SERVER_HOST),
     configServer(InfrastructureApplication.CONFIG_SERVER),
     proxyHost(InfrastructureApplication.PROXY_HOST),
-    proxy(InfrastructureApplication.PROXY, proxyHost, configServer),
+    proxy(InfrastructureApplication.PROXY, configServer),
     tenantHost(InfrastructureApplication.TENANT_HOST);
 
     /** The tenant owning all system applications */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index a7360f3d2d8..d3d66715202 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -324,9 +324,9 @@ public class SystemUpgraderTest {
         for (var zone : List.of(zone1, zone2)) {
             systemUpgrader.maintain();
             completeUpgrade(List.of(SystemApplication.tenantHost,
-                            SystemApplication.proxyHost,
-                            SystemApplication.configServerHost),
-                    version2, zone);
+                                    SystemApplication.proxyHost,
+                                    SystemApplication.configServerHost),
+                            version2, zone);
             completeUpgrade(SystemApplication.configServer, version2, zone);
             systemUpgrader.maintain();
             completeUpgrade(SystemApplication.proxy, version2, zone);
@@ -341,12 +341,12 @@ public class SystemUpgraderTest {
         for (var zone : List.of(zone2, zone1)) {
             systemUpgrader.maintain();
             completeUpgrade(List.of(SystemApplication.tenantHost,
-                            SystemApplication.configServerHost,
-                            SystemApplication.proxy),
-                    version1, zone);
+                                    SystemApplication.configServerHost,
+                                    SystemApplication.proxyHost,
+                                    SystemApplication.proxy),
+                            version1, zone);
             convergeServices(SystemApplication.proxy, zone);
-            List<SystemApplication> lastToDowngrade = List.of(SystemApplication.configServer,
-                    SystemApplication.proxyHost);
+            List<SystemApplication> lastToDowngrade = List.of(SystemApplication.configServer);
             assertWantedVersion(lastToDowngrade, version2, zone);
 
             // ... and then configserver and proxyhost