diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2023-08-30 11:01:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 11:01:06 +0200 |
commit | 30ff0640854e3d840786136a151cbe616467ffa7 (patch) | |
tree | ae3cbd05597816f033fc5f8945dab62a838c92bb /controller-server | |
parent | 9901919395117c0f3034929b5b50259a03239688 (diff) |
Revert "Ignore GCP enclave nodes in convergence check [MERGEOK]"
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 6 |
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); } |