Skip to content

[v25.3.x] CORE-14619 rpk: fix version check logic for semver #29147

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
pgellert merged 1 commit into from
Jan 5, 2026
Merged

[v25.3.x] CORE-14619 rpk: fix version check logic for semver #29147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/go/rpk/pkg/redpanda/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ func (v Version) Less(b Version) bool {

// IsAtLeast returns true if the version is greater than or equal to the passed version.
func (v Version) IsAtLeast(b Version) bool {
if v.Major >= b.Major {
if v.Feature >= b.Feature {
return v.Patch >= b.Patch
}
if v.Major != b.Major {
return v.Major > b.Major
}
if v.Feature != b.Feature {
return v.Feature > b.Feature
}
return false
return v.Patch >= b.Patch
}

func (v Version) String() string {
Expand Down
1 change: 1 addition & 0 deletions src/go/rpk/pkg/redpanda/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func TestVersion_IsAtLeast(t *testing.T) {
{"lower year", Version{23, 1, 1}, Version{22, 1, 1}, true},
{"lower feature", Version{22, 3, 23}, Version{22, 2, 23}, true},
{"lower patch", Version{23, 4, 23}, Version{23, 4, 22}, true},
{"next major with lower minor and patch", Version{26, 1, 1}, Version{25, 3, 2}, true},
} {
t.Run(test.name, func(t *testing.T) {
require.Equal(t, test.a.IsAtLeast(test.b), test.exp)
Expand Down
Loading