diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2023-08-30 11:00:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 11:00:48 +0200 |
commit | 9901919395117c0f3034929b5b50259a03239688 (patch) | |
tree | 48c44813ff06386a50c3fe63b0cb6d922efc9287 | |
parent | 306dce28ed3cfa0d2f4679fd2519db3d1ac780c7 (diff) | |
parent | 7a23b0a2a82bda5c0943c6ca6be4575e28c97bda (diff) |
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]
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 6 |
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); } |