From 854406a476cae2e2297a726a6e7fa540035e611e Mon Sep 17 00:00:00 2001 From: Pierre Prinetti Date: Fri, 3 Sep 2021 11:40:30 +0200 Subject: [PATCH] CustomNoUpgrade should not fire no-upgrade failures Fixup of 5fb0f9967c1a923b72f4929a344bd35b73f56675 The commit that is being fixed-up introduced a check against a message that is not implemented anywhere, thus rendering the function `isKubeAPIUpgradableNoUpgradeCondition` unusable. This patch removes the check on the condition message. --- test/extended/operators/operators.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/extended/operators/operators.go b/test/extended/operators/operators.go index 102d9e867975..43ad9f626604 100644 --- a/test/extended/operators/operators.go +++ b/test/extended/operators/operators.go @@ -259,6 +259,5 @@ func isKubeAPIUpgradableNoUpgradeCondition(cond configv1.ClusterOperatorStatusCo return (cond.Reason == "FeatureGates_RestrictedFeatureGates_TechPreviewNoUpgrade" || cond.Reason == "FeatureGates_RestrictedFeatureGates_CustomNoUpgrade") && cond.Status == "False" && - cond.Type == "Upgradeable" && - cond.Message == "FeatureGatesUpgradeable: \"TechPreviewNoUpgrade\" and \"CustomNoUpgrades\" do not allow updates" + cond.Type == "Upgradeable" }