Merge pull request kubernetes#126703 from SataQiu/kubeadm-etcd-1.32

k8s-ci-robot · web-flow · commit ae7e6267e589 · 2024-08-15T05:41:18.000-07:00
kubeadm: update supported etcd version list for 1.32
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
@@ -484,6 +484,7 @@ var (
 		29: "3.5.15-0",
 		30: "3.5.15-0",
 		31: "3.5.15-0",
+		32: "3.5.15-0",
 	}
 
 	// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows
diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go
@@ -99,7 +99,7 @@ func TestGetStaticPodFilepath(t *testing.T) {
 }
 
 func TestEtcdSupportedVersionLength(t *testing.T) {
-	const max = 3
+	const max = 4
 	if len(SupportedEtcdVersion) > max {
 		t.Fatalf("SupportedEtcdVersion must not include more than %d versions", max)
 	}

Original file line number	Diff line number	Diff line change
`@@ -484,6 +484,7 @@ var (`
`484`	`484`	`29: "3.5.15-0",`
`485`	`485`	`30: "3.5.15-0",`
`486`	`486`	`31: "3.5.15-0",`
	`487`	`+ 32: "3.5.15-0",`
`487`	`488`	`}`
`488`	`489`
`489`	`490`	`// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func TestGetStaticPodFilepath(t *testing.T) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`func TestEtcdSupportedVersionLength(t *testing.T) {`
`102`		`- const max = 3`
	`102`	`+ const max = 4`
`103`	`103`	`if len(SupportedEtcdVersion) > max {`
`104`	`104`	`t.Fatalf("SupportedEtcdVersion must not include more than %d versions", max)`
`105`	`105`	`}`