Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
67ffd2ab
Unverified
Commit
67ffd2ab
authored
Jan 07, 2025
by
Derek Nola
Committed by
GitHub
Jan 07, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix skew semver for release-XX branches (#11531)
Signed-off-by:
Derek Nola
<
derek.nola@suse.com
>
parent
c3460fce
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
skew_test.go
tests/docker/skew/skew_test.go
+4
-4
No files found.
tests/docker/skew/skew_test.go
View file @
67ffd2ab
...
...
@@ -33,7 +33,7 @@ var _ = BeforeSuite(func() {
// For master and unreleased branches, we want the latest stable release
var
upgradeChannel
string
var
err
error
if
*
branch
==
"master"
||
*
branch
==
"release-
v
1.32"
{
if
*
branch
==
"master"
||
*
branch
==
"release-1.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.
// ref: https://github.com/kubernetes/kubernetes/pull/128168
...
...
@@ -44,10 +44,10 @@ var _ = BeforeSuite(func() {
upgradeChannel
=
strings
.
Replace
(
*
branch
,
"release-"
,
"v"
,
1
)
// now that it is in v1.1 format, we want to substract one from the minor version
// to get the previous release
sV
,
err
:=
semver
.
Parse
(
upgradeChannel
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
sV
,
err
:=
semver
.
Parse
Tolerant
(
upgradeChannel
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
()
,
"failed to parse version from "
+
upgradeChannel
)
sV
.
Minor
--
upgradeChannel
=
sV
.
String
(
)
upgradeChannel
=
fmt
.
Sprintf
(
"v%d.%d"
,
sV
.
Major
,
sV
.
Minor
)
}
lastMinorVersion
,
err
=
tester
.
GetVersionFromChannel
(
upgradeChannel
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment