Merge pull request kubernetes#134775 from neolit123/1.35-adjust-supported-etcd-versions-by-kubeadm

kubeadm: adjust the etcd version map for release 1.35

Author: k8s-ci-robot

cmd/kubeadm/app/constants/constants.go

@@ -323,7 +323,7 @@ const (
 	KubeletHealthzPort = 10248
 
 	// MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports
-	MinExternalEtcdVersion = "3.5.21-0"
+	MinExternalEtcdVersion = "3.5.23-0"
 
 	// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
 	DefaultEtcdVersion = "3.6.5-0"
@@ -497,11 +497,14 @@ var (
 	CurrentKubernetesVersion = getSkewedKubernetesVersion(0)
 
 	// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
+	// If you are updating the versions in this map, make sure to also update:
+	// - MinExternalEtcdVersion: with the minimum etcd version from this map.
+	// - DefaultEtcdVersion: with etcd version used for the current k8s release.
 	SupportedEtcdVersion = map[uint8]string{
-		31: "3.5.23-0",
 		32: "3.5.23-0",
 		33: "3.5.23-0",
-		34: "3.6.5-0",
+		34: "3.5.23-0",
+		35: "3.6.5-0",
 	}
 
 	// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows