From 0e2e687d3cc8e7e7537bf4a5465cb8d834f36848 Mon Sep 17 00:00:00 2001 From: joshjms Date: Tue, 1 Apr 2025 01:18:58 +0800 Subject: [PATCH] cleanup etcd v3.6.0 Signed-off-by: joshjms --- cluster/images/etcd/Makefile | 4 ++-- cluster/images/etcd/migrate/options.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 21c28f7241a..6e7ab539bf0 100644 --- a/cluster/images/etcd/Makefile +++ b/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 diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go index 1ab1894b460..ccb73d26845 100644 --- a/cluster/images/etcd/migrate/options.go +++ b/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 (