From 4a944d1a3fab9aa0bc8c985dfa7ad607ecf28531 Mon Sep 17 00:00:00 2001 From: Angelos Kolaitis Date: Wed, 3 Dec 2025 11:58:12 +0200 Subject: [PATCH 1/3] add skew -2 version in SupportedEtcdVersion Signed-off-by: Angelos Kolaitis --- cmd/kubeadm/app/constants/constants.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 4bc2b9a6a04..1c34322539c 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -503,6 +503,7 @@ var ( // The maximum length of the map should be 2, as kubeadm supports a maximum skew of -1 // with the control plane version. SupportedEtcdVersion = map[uint8]string{ + uint8(getSkewedKubernetesVersion(-2).Minor()): "3.5.24-0", uint8(getSkewedKubernetesVersion(-1).Minor()): "3.5.24-0", uint8(getSkewedKubernetesVersion(0).Minor()): "3.6.5-0", } From aa54ffa485a6bf38b8c40b27b491152d6b613d0b Mon Sep 17 00:00:00 2001 From: Angelos Kolaitis Date: Wed, 3 Dec 2025 13:15:49 +0200 Subject: [PATCH 2/3] fix etcd versions after rotation Signed-off-by: Angelos Kolaitis --- cmd/kubeadm/app/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 1c34322539c..8c107f034f4 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -504,7 +504,7 @@ var ( // with the control plane version. SupportedEtcdVersion = map[uint8]string{ uint8(getSkewedKubernetesVersion(-2).Minor()): "3.5.24-0", - uint8(getSkewedKubernetesVersion(-1).Minor()): "3.5.24-0", + uint8(getSkewedKubernetesVersion(-1).Minor()): "3.6.5-0", uint8(getSkewedKubernetesVersion(0).Minor()): "3.6.5-0", } From 03066850f638894321de2dd05fb78029bb0c0a11 Mon Sep 17 00:00:00 2001 From: Angelos Kolaitis Date: Wed, 3 Dec 2025 13:19:09 +0200 Subject: [PATCH 3/3] remove TestEtcdSupportedVersionLength, no longer relevant Signed-off-by: Angelos Kolaitis --- cmd/kubeadm/app/constants/constants_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 31b786f5d50..dea843890e1 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -98,13 +98,6 @@ func TestGetStaticPodFilepath(t *testing.T) { } } -func TestEtcdSupportedVersionLength(t *testing.T) { - const max = 2 - if len(SupportedEtcdVersion) > max { - t.Fatalf("SupportedEtcdVersion must not include more than %d versions", max) - } -} - func TestEtcdSupportedVersion(t *testing.T) { var supportedEtcdVersion = map[uint8]string{ 17: "3.3.17-0",