Skip to content

Commit 73a2205

Browse files
authored
Hard-code version upgrade message for 4.22 upgrade paths (#3748)
Rather than update the logic, since we do not know whether what the upgrade paths will look like for potential minor versions past 4.23, we are simply hard-coding the upgrade message for 4.23 and will return to change it once upgrade paths are known. OPRUN-4401
1 parent a0f3015 commit 73a2205

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

pkg/controller/operators/openshift/helpers.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@ func (s skews) String() string {
9191
j--
9292
}
9393

94-
// it is safe to ignore the error here, with the assumption
95-
// that we build each skew object only after verifying that the
96-
// version string is parseable safely.
97-
maxOCPVersion, _ := semver.ParseTolerant(s[0].maxOpenShiftVersion)
98-
nextY := nextY(maxOCPVersion).String()
99-
return fmt.Sprintf("ClusterServiceVersions blocking minor version upgrades to %s or higher:\n%s", nextY, strings.Join(msg, "\n"))
94+
// TODO Revisit this message after 4.23 release once release schedule is determined for future possible minor versions.
95+
return fmt.Sprintf("ClusterServiceVersions blocking minor version upgrades to 4.23 or major version upgrades to 5.0:\n%s", strings.Join(msg, "\n"))
10096
}
10197

10298
type skew struct {

0 commit comments

Comments
 (0)