Skip to content

OPRUN-4519: block upgrades from 4.23 to 5.0 #3803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Apr 3, 2026
Merged

OPRUN-4519: block upgrades from 4.23 to 5.0 #3803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d166c42
Fix maxOpenShiftVersion blocking at OCP 4.23/5.0 boundary
fgiudici Mar 26, 2026
8d31786
Add unit tests for OCP 4.23/5.0 upgrade edge compatibility
fgiudici Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion pkg/controller/operators/openshift/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ func incompatibleOperators(ctx context.Context, cli client.Client) (skews, error
return nil, &transientError{fmt.Errorf("failed to list ClusterServiceVersions: %w", err)}
}

// Normalize the current cluster version: OCP 4.23 and 5.0 represent the same release.
normalizedCurrent := normalizeOCPVersion(*current)
nextMinor := nextY(normalizedCurrent)

var incompatible skews
for _, csv := range csvList.Items {
if csv.IsCopied() {
Expand All @@ -153,7 +157,13 @@ func incompatibleOperators(ctx context.Context, cli client.Client) (skews, error
continue
}

if max == nil || max.GTE(nextY(*current)) {
if max == nil {
continue
}

// Normalize the operator's maxOpenShiftVersion: 4.23 and 5.0 are equivalent.
normalizedMax := normalizeOCPVersion(*max)
if normalizedMax.GTE(nextMinor) {
continue
}

Expand Down Expand Up @@ -223,6 +233,15 @@ func nextY(v semver.Version) semver.Version {
return semver.Version{Major: v.Major, Minor: v.Minor + 1} // Sets Y=Y+1
}

// normalizeOCPVersion maps OCP 4.23 to 5.0, since they represent the same release.
// All other versions are returned with only the major and minor components.
func normalizeOCPVersion(v semver.Version) semver.Version {
if v.Major == 4 && v.Minor == 23 {
return semver.Version{Major: 5, Minor: 0}
}
return semver.Version{Major: v.Major, Minor: v.Minor}
}

const (
MaxOpenShiftVersionProperty = "olm.maxOpenShiftVersion"
)
Expand Down
188 changes: 188 additions & 0 deletions pkg/controller/operators/openshift/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,141 @@ func TestIncompatibleOperators(t *testing.T) {
},
},
},
// OCP 4.23 and OCP 5.0 represent the same release
{
description: "OCP4.22",
version: "4.22.0",
in: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
{
name: "chestnut",
namespace: "default",
maxOpenShiftVersion: "5.1",
},
},
expect: expect{
incompatible: nil,
},
},
{
description: "OCP4.23",
version: "4.23.0",
in: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
{
name: "chestnut",
namespace: "default",
maxOpenShiftVersion: "5.1",
},
},
expect: expect{
incompatible: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
},
},
},
{
description: "OCP5.0",
version: "5.0.0",
in: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
{
name: "chestnut",
namespace: "default",
maxOpenShiftVersion: "5.1",
},
},
expect: expect{
incompatible: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
},
},
},
{
description: "OCP5.1",
version: "5.1.0",
in: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
{
name: "chestnut",
namespace: "default",
maxOpenShiftVersion: "5.1",
},
},
expect: expect{
incompatible: skews{
{
name: "almond",
namespace: "default",
maxOpenShiftVersion: "4.23",
},
{
name: "beech",
namespace: "default",
maxOpenShiftVersion: "5.0",
},
{
name: "chestnut",
namespace: "default",
maxOpenShiftVersion: "5.1",
},
},
},
},
} {
t.Run(tt.description, func(t *testing.T) {
objs := []client.Object{}
Expand Down Expand Up @@ -620,10 +755,63 @@ func TestOCPVersionNextY(t *testing.T) {
inVersion: semver.MustParse("4.16.0-rc1"),
expectedVersion: semver.MustParse("4.17.0"),
},
{
description: "Version: 4.23.0. Expected output: 4.24",
inVersion: semver.MustParse("4.23.0"),
expectedVersion: semver.MustParse("4.24.0"),
},
{
description: "Version: 5.0.0. Expected output: 5.1",
inVersion: semver.MustParse("5.0.0"),
expectedVersion: semver.MustParse("5.1.0"),
},
} {
t.Run(tc.description, func(t *testing.T) {
outVersion := nextY(tc.inVersion)
require.Equal(t, outVersion, tc.expectedVersion)
})
}
}

func TestNormalizeOCPVersion(t *testing.T) {
for _, tc := range []struct {
description string
in semver.Version
expected semver.Version
}{
{
description: "4.22 stays 4.22",
in: semver.MustParse("4.22.0"),
expected: semver.Version{Major: 4, Minor: 22},
},
{
description: "4.22.0-rc1 normalizes to 4.22",
in: semver.MustParse("4.22.0-rc1"),
expected: semver.Version{Major: 4, Minor: 22},
},
{
description: "4.23 normalizes to 5.0",
in: semver.MustParse("4.23.0"),
expected: semver.Version{Major: 5, Minor: 0},
},
{
description: "5.0 stays 5.0",
in: semver.MustParse("5.0.0"),
expected: semver.Version{Major: 5, Minor: 0},
},
{
description: "5.1 stays 5.1",
in: semver.MustParse("5.1.0"),
expected: semver.Version{Major: 5, Minor: 1},
},
{
description: "4.23.0-rc1 normalizes to 5.0",
in: semver.MustParse("4.23.0-rc1"),
expected: semver.Version{Major: 5, Minor: 0},
},
} {
t.Run(tc.description, func(t *testing.T) {
require.Equal(t, tc.expected, normalizeOCPVersion(tc.in))
})
}
}