From 7a23b0a2a82bda5c0943c6ca6be4575e28c97bda Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Wed, 30 Aug 2023 10:48:10 +0200 Subject: Ignore GCP enclave nodes in convergence check --- .../yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 { @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); } -- cgit v1.2.3