Skip to content

Commit efd6132

Browse files
committed
skip config-operator checking when featureSet is DevPreviewNoUpgrade
1 parent 130265e commit efd6132

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/extended/operators/operators.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,13 @@ func surprisingConditions(co objx.Map) ([]configv1.ClusterOperatorStatusConditio
312312
return badConditions, missingTypes
313313
}
314314

315-
// When a TechPreviewNoUpgrade or CustomNoUpgrades feature set are in force in the cluster, the following condition
315+
// When a TechPreviewNoUpgrade, DevPreviewNoUpgrade or CustomNoUpgrades feature set are in force in the cluster, the following condition
316316
// is set on the kube-apiserver and/or the cluster-config clusteroperator
317317
// Ref: https://github.com/openshift/cluster-kube-apiserver-operator/blob/39a98d67c3b825b9215454a7817ffadb0577609b/pkg/operator/featureupgradablecontroller/feature_upgradeable_controller_test.go#L41-L46
318318
func isUpgradableNoUpgradeCondition(cond configv1.ClusterOperatorStatusCondition) bool {
319319
return (cond.Reason == "FeatureGates_RestrictedFeatureGates_TechPreviewNoUpgrade" ||
320-
cond.Reason == "FeatureGates_RestrictedFeatureGates_CustomNoUpgrade") &&
320+
cond.Reason == "FeatureGates_RestrictedFeatureGates_CustomNoUpgrade" ||
321+
cond.Reason == "FeatureGates_RestrictedFeatureGates_DevPreviewNoUpgrade") &&
321322
cond.Status == "False" &&
322323
cond.Type == "Upgradeable"
323324
}

0 commit comments

Comments
 (0)