Add more exceptions for CO/image-registry's Degraded=True

hongkailiu · hongkailiu · commit 6c5867e4de6b · 2025-12-09T01:50:31.000+08:00
The new reasons are ImageConfigControllerError and Unavailable. It would help jobs such as [1, 2]. [1]. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.21-e2e-vsphere-ovn-upgrade/1997799449451040768 [2]. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-upgrade-fips/1997883437565874176
diff --git a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
@@ -432,7 +432,12 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
 				return "https://issues.redhat.com/browse/OCPBUGS-23744"
 			}
 		case "image-registry":
-			if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue && (condition.Reason == "NodeCADaemonControllerError" || condition.Reason == "ProgressDeadlineExceeded") {
+			if condition.Type == configv1.OperatorDegraded &&
+				condition.Status == configv1.ConditionTrue &&
+				(condition.Reason == "NodeCADaemonControllerError" ||
+					condition.Reason == "ProgressDeadlineExceeded" ||
+					condition.Reason == "ImageConfigControllerError" ||
+					condition.Reason == "Unavailable") {
 				return "https://issues.redhat.com/browse/OCPBUGS-38667"
 			}
 			// this won't handle the replicaCount==2 serial test where both pods are on nodes that get tainted.

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,12 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf`
`432`	`432`	`return "https://issues.redhat.com/browse/OCPBUGS-23744"`
`433`	`433`	`}`
`434`	`434`	`case "image-registry":`
`435`		`- if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue && (condition.Reason == "NodeCADaemonControllerError" \|\| condition.Reason == "ProgressDeadlineExceeded") {`
	`435`	`+ if condition.Type == configv1.OperatorDegraded &&`
	`436`	`+ condition.Status == configv1.ConditionTrue &&`
	`437`	`+ (condition.Reason == "NodeCADaemonControllerError" \|\|`
	`438`	`+ condition.Reason == "ProgressDeadlineExceeded" \|\|`
	`439`	`+ condition.Reason == "ImageConfigControllerError" \|\|`
	`440`	`+ condition.Reason == "Unavailable") {`
`436`	`441`	`return "https://issues.redhat.com/browse/OCPBUGS-38667"`
`437`	`442`	`}`
`438`	`443`	`// this won't handle the replicaCount==2 serial test where both pods are on nodes that get tainted.`