From c3a056078cd638ec83a250c93d4ce6038653132b Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Fri, 29 Sep 2023 13:32:29 +0530 Subject: [PATCH] bump etcd cluster image to 3.5.9 Etcd version has been bumped in master and 1.28 branch to 3.5.9 however cluster image has been kept on older versions. This bump the same to 3.5.9 to make it consistent. Signed-off-by: Humble Chirammal --- build/dependencies.yaml | 2 +- cluster/images/etcd/Makefile | 2 +- cluster/images/etcd/migrate/options.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c4e57c46c0e..5f4b62c23a4 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -80,7 +80,7 @@ dependencies: match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"} - name: "etcd-image" - version: 3.5.7 + version: 3.5.9 refPaths: - path: cluster/images/etcd/Makefile match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\? diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index dd151f70f47..d186da31e55 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -26,7 +26,7 @@ # 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.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.7 +BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.9 # LATEST_ETCD_VERSION identifies the most recent etcd version available. LATEST_ETCD_VERSION?=3.5.7 diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go index 74f92a2b240..2b4a25cf2f9 100644 --- a/cluster/images/etcd/migrate/options.go +++ b/cluster/images/etcd/migrate/options.go @@ -28,7 +28,7 @@ import ( ) var ( - supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.7"} + supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.9"} ) const (