Merge pull request #28260 from vespa-engine/hakonhall/ignore-gcp-enclave-nodes-in-convergence-checkv8.219.19

Ignore GCP enclave nodes in convergence check [MERGEOK]

1 files changed, 6 insertions, 0 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 effcc4dd4df..622653e6f84 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,6 +2,8 @@
 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;
@@ -50,6 +52,10 @@ 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);
     }