Merge pull request #30581 from hongkailiu/degraded-image-registry

openshift-merge-bot[bot] · web-flow · commit 90b42f2ba933 · 2026-01-08T12:39:44.000Z
OCPBUGS-66225: Add more exceptions for CO/image-registry's Degraded=True
diff --git a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
@@ -438,7 +438,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
`@@ -438,7 +438,12 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf`
`438`	`438`	`return "https://issues.redhat.com/browse/OCPBUGS-23744"`
`439`	`439`	`}`
`440`	`440`	`case "image-registry":`
`441`		`- if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue && (condition.Reason == "NodeCADaemonControllerError" \|\| condition.Reason == "ProgressDeadlineExceeded") {`
	`441`	`+ if condition.Type == configv1.OperatorDegraded &&`
	`442`	`+ condition.Status == configv1.ConditionTrue &&`
	`443`	`+ (condition.Reason == "NodeCADaemonControllerError" \|\|`
	`444`	`+ condition.Reason == "ProgressDeadlineExceeded" \|\|`
	`445`	`+ condition.Reason == "ImageConfigControllerError" \|\|`
	`446`	`+ condition.Reason == "Unavailable") {`
`442`	`447`	`return "https://issues.redhat.com/browse/OCPBUGS-38667"`
`443`	`448`	`}`
`444`	`449`	`// this won't handle the replicaCount==2 serial test where both pods are on nodes that get tainted.`