Skip to content

Commit 9762e92

Browse files
committed
Disable tests with down-rev agents
These are broken by AuthorizeNodeWithSelectors being on by default. All agents must be upgraded to v1.32 or newer to work properly, until we backport RBAC changes to older branches. Signed-off-by: Brad Davidson <[email protected]>
1 parent 81bb604 commit 9762e92

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

tests/docker/skew/skew_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ var _ = BeforeSuite(func() {
3333
// For master and unreleased branches, we want the latest stable release
3434
var upgradeChannel string
3535
var err error
36-
if *branch == "master" {
36+
if *branch == "master" || *branch == "release-v1.32" {
37+
// disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32.
38+
// This can be ren-enabled once the previous branch is v1.32 or higher, or when RBAC changes have been backported.
39+
// ref: https://github.com/kubernetes/kubernetes/pull/128168
40+
Skip("Skipping version skew tests for " + *branch + " due to AuthorizeNodeWithSelectors")
41+
3742
upgradeChannel = "stable"
3843
} else {
3944
upgradeChannel = strings.Replace(*branch, "release-", "v", 1)
@@ -48,11 +53,11 @@ var _ = BeforeSuite(func() {
4853
lastMinorVersion, err = tester.GetVersionFromChannel(upgradeChannel)
4954
Expect(err).NotTo(HaveOccurred())
5055
Expect(lastMinorVersion).To(ContainSubstring("v1."))
56+
5157
fmt.Println("Using last minor version: ", lastMinorVersion)
5258
})
5359

5460
var _ = Describe("Skew Tests", Ordered, func() {
55-
5661
Context("Setup Cluster with Server newer than Agent", func() {
5762
It("should provision new servers and old agents", func() {
5863
var err error

tests/docker/test-run-compat

+12-3
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,23 @@ LATEST_VERSION=$(curl -s https://update.k3s.io/v1-release/channels/latest -o /de
3636

3737
# --- create a basic cluster to test for compat with the previous minor version of the server and agent
3838
K3S_IMAGE_SERVER=${REPO}/${IMAGE_NAME}:${PREVIOUS_VERSION} LABEL=PREVIOUS-SERVER run-test
39-
K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${PREVIOUS_VERSION} LABEL=PREVIOUS-AGENT run-test
39+
# disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32.
40+
# This can be ren-enabled once the previous branch is v1.32 or higher, or when RBAC changes have been backported.
41+
# ref: https://github.com/kubernetes/kubernetes/pull/128168
42+
#K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${PREVIOUS_VERSION} LABEL=PREVIOUS-AGENT run-test
4043

4144
# --- create a basic cluster to test for compat with the stable version of the server and agent
4245
K3S_IMAGE_SERVER=${REPO}/${IMAGE_NAME}:${STABLE_VERSION} LABEL=STABLE-SERVER run-test
43-
K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${STABLE_VERSION} LABEL=STABLE-AGENT run-test
46+
# disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32
47+
# This can be ren-enabled once the stable release is v1.32 or higher, or when RBAC changes have been backported.
48+
# ref: https://github.com/kubernetes/kubernetes/pull/128168
49+
#K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${STABLE_VERSION} LABEL=STABLE-AGENT run-test
4450

4551
# --- create a basic cluster to test for compat with the latest version of the server and agent
4652
K3S_IMAGE_SERVER=${REPO}/${IMAGE_NAME}:${LATEST_VERSION} LABEL=LATEST-SERVER run-test
47-
K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${LATEST_VERSION} LABEL=LATEST-AGENT run-test
53+
# disabled: AuthorizeNodeWithSelectors is now on by default, which breaks compat with agents < v1.32
54+
# This can be ren-enabled once the latest release is v1.32 or higher, or when RBAC changes have been backported.
55+
# ref: https://github.com/kubernetes/kubernetes/pull/128168
56+
#K3S_IMAGE_AGENT=${REPO}/${IMAGE_NAME}:${LATEST_VERSION} LABEL=LATEST-AGENT run-test
4857

4958
cleanup-test-env

0 commit comments

Comments
 (0)