Merge pull request #28306 from wking/return-to-structured-ClusterOperator-condition-type

openshift-ci[bot] · web-flow · commit 72fa973a9791 · 2023-10-12T21:22:18.000Z
pkg/monitortests/clusterversionoperator/legacycvomonitortests: Structured condition types
diff --git a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go
@@ -276,7 +276,13 @@ func testOperatorState(interestingCondition configv1.ClusterStatusConditionType,
 		if eventInterval.From == eventInterval.To {
 			continue
 		}
-		if !strings.Contains(eventInterval.Message, fmt.Sprintf("%v", interestingCondition)) {
+
+		condition := monitorapi.GetOperatorConditionStatus(eventInterval)
+		if condition == nil {
+			continue
+		}
+
+		if condition.Type != interestingCondition {
 			continue
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,13 @@ func testOperatorState(interestingCondition configv1.ClusterStatusConditionType,`
`276`	`276`	`if eventInterval.From == eventInterval.To {`
`277`	`277`	`continue`
`278`	`278`	`}`
`279`		`- if !strings.Contains(eventInterval.Message, fmt.Sprintf("%v", interestingCondition)) {`
	`279`	`+`
	`280`	`+ condition := monitorapi.GetOperatorConditionStatus(eventInterval)`
	`281`	`+ if condition == nil {`
	`282`	`+ continue`
	`283`	`+ }`
	`284`	`+`
	`285`	`+ if condition.Type != interestingCondition {`
`280`	`286`	`continue`
`281`	`287`	`}`
`282`	`288`