Merge pull request kubernetes#131126 from joshjms/cleanup-3.6.0

Release etcd v3.5.21 image

Author: k8s-ci-robot

cluster/images/etcd/Makefile

@@ -26,10 +26,10 @@
 # Except from etcd-$(version) and etcdctl-$(version) binaries, we also
 # need etcd and etcdctl binaries for backward compatibility reasons.
 # That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
-BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21 3.6.0-rc.2
+BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21
 
 # LATEST_ETCD_VERSION identifies the most recent etcd version available.
-LATEST_ETCD_VERSION?=3.6.0-rc.2
+LATEST_ETCD_VERSION?=3.5.21
 
 # REVISION provides a version number for this image and all it's bundled
 # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment

cluster/images/etcd/migrate/options.go

@@ -28,7 +28,7 @@ import (
 )
 
 var (
-	supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.0-rc.2"}
+	supportedEtcdVersions = []string{"3.4.18", "3.5.21"}
 )
 
 const (