Merge pull request #30979 from sosiouxme/20260408-terminationMessage-hack

openshift-merge-bot[bot] · web-flow · commit f6d810fc6294 · 2026-04-08T21:24:46.000Z
TRT-2084: terminationmessagepolicy: relax for 5.0
diff --git a/pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go b/pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go
@@ -27,6 +27,11 @@ func init() {
 	for i := 0; i < 16; i++ {
 		unfixedVersions.Insert(fmt.Sprintf("4.%d", i))
 	}
+
+	// TODO: [lmeyer 2026-04-08] replace this temporary hack.
+	unfixedVersions.Insert("5.0")
+	// the algorithm below has permitted every release since 4.20 to flake because "4.2" is in the version.
+	// predictably, a number of violations have crept in. once those are fixed, fix hasOldVersion determination below.
 }
 
 type terminationMessagePolicyChecker struct {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@ func init() {`
`27`	`27`	`for i := 0; i < 16; i++ {`
`28`	`28`	`unfixedVersions.Insert(fmt.Sprintf("4.%d", i))`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ // TODO: [lmeyer 2026-04-08] replace this temporary hack.`
	`32`	`+ unfixedVersions.Insert("5.0")`
	`33`	`+ // the algorithm below has permitted every release since 4.20 to flake because "4.2" is in the version.`
	`34`	`+ // predictably, a number of violations have crept in. once those are fixed, fix hasOldVersion determination below.`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`type terminationMessagePolicyChecker struct {`