Merge pull request #28262 from vespa-engine/revert-28260-hakonhall/ignore-gcp-enclave-nodes-in-convergence-check

Revert "Ignore GCP enclave nodes in convergence check [MERGEOK]"

1 files changed, 0 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
index 622653e6f84..effcc4dd4df 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
@@ -2,8 +2,6 @@
 package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.component.Version;
-import com.yahoo.config.provision.CloudName;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.NodeSlice;
 import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.text.Text;
@@ -52,10 +50,6 @@ public class SystemUpgrader extends InfrastructureUpgrader<VespaVersionTarget> {
 
     @Override
     protected boolean expectUpgradeOf(Node node, SystemApplication application, ZoneApi zone) {
-        // Temporary hack until GCP enclave works again
-        if (zone.getCloudName().equals(CloudName.GCP) && node.hostname().value().startsWith("e"))
-            return false;
-
         return eligibleForUpgrade(node);
     }