Remove AWS hack

2 files changed, 1 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 cc4f236f3b2..7a7504830dd 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
@@ -68,10 +68,6 @@ public enum SystemApplication {
         if (!hasApplicationPackage()) {
             return true;
         }
-        // TODO: Remove this hack once Docker hosts are removed from zone-application.
-        if (isAws(zone.region())) {
-            return true; // Skip checking config convergence on AWS as Docker hosts do not have cloud config
-        }
         return controller.configServer().serviceConvergence(new DeploymentId(id(), zone))
                          .map(ServiceConvergence::converged)
                          .orElse(false);
@@ -92,8 +88,4 @@ public enum SystemApplication {
         return String.format("system application %s of type %s", id, nodeTypes);
     }
 
-    private static boolean isAws(RegionName region) {
-        return region.value().startsWith("cd-aws-") || region.value().startsWith("aws-");
-    }
-
 }
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 206e1dc7e98..baff67ef4bd 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
@@ -96,7 +96,7 @@ public abstract class InfrastructureUpgrader extends Maintainer {
                                .nodeRepository()
                                .list(zone, application.id())
                                .stream()
-                               .filter((node) -> requireUpgradeOf(node, application, zone))
+                               .filter(node -> requireUpgradeOf(node, application, zone))
                                .map(versionField)
                                .min(Comparator.naturalOrder());
         } catch (Exception e) {