github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 13:57:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #135568 from neoaggelos/neo/etcd-supported-versions

Browse Source 
add skew -2 version in SupportedEtcdVersion
This commit is contained in:
Kubernetes Prow Robot
2025-12-03 04:10:26 -08:00
committed by GitHub
parent 76b76c2d52 03066850f6
commit 579d4c6d06
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/constants/constants.go
View File

@@ -503,7 +503,8 @@ 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(-1).Minor()): "3.5.24-0",
uint8(getSkewedKubernetesVersion(-2).Minor()): "3.5.24-0",
uint8(getSkewedKubernetesVersion(-1).Minor()): "3.6.5-0",
uint8(getSkewedKubernetesVersion(0).Minor()): "3.6.5-0",
}

7
cmd/kubeadm/app/constants/constants_test.go
View File

@@ -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",