k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix skew semver for release-XX branches (#11531) 

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/11535/head
Derek Nola 2025-01-07 12:25:42 -08:00 committed by GitHub
parent c3460fce73
commit 67ffd2ab1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/docker/skew/skew_test.go
View File

@ -33,7 +33,7 @@ var _ = BeforeSuite(func() {
// For master and unreleased branches, we want the latest stable release // For master and unreleased branches, we want the latest stable release
var upgradeChannel string var upgradeChannel string
var err error var err error
if *branch == "master" || *branch == "release-v1.32" { if *branch == "master" || *branch == "release-1.32" {
// disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32. // disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32.
// This can be ren-enabled once the previous branch is v1.32 or higher, or when RBAC changes have been backported. // This can be ren-enabled once the previous branch is v1.32 or higher, or when RBAC changes have been backported.
// ref: https://github.com/kubernetes/kubernetes/pull/128168 // ref: https://github.com/kubernetes/kubernetes/pull/128168
@ -44,10 +44,10 @@ var _ = BeforeSuite(func() {
upgradeChannel = strings.Replace(*branch, "release-", "v", 1) upgradeChannel = strings.Replace(*branch, "release-", "v", 1)
// now that it is in v1.1 format, we want to substract one from the minor version // now that it is in v1.1 format, we want to substract one from the minor version
// to get the previous release // to get the previous release
sV, err := semver.Parse(upgradeChannel) sV, err := semver.ParseTolerant(upgradeChannel)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred(), "failed to parse version from "+upgradeChannel)
sV.Minor-- sV.Minor--
upgradeChannel = sV.String() upgradeChannel = fmt.Sprintf("v%d.%d", sV.Major, sV.Minor)
} }
lastMinorVersion, err = tester.GetVersionFromChannel(upgradeChannel) lastMinorVersion, err = tester.GetVersionFromChannel(upgradeChannel)