From 1289f43f73f9738b4b20fe5bc3bda47817dbb2b3 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Fri, 21 Feb 2025 10:31:05 +0100 Subject: [PATCH] Build etcd v3.6.0-rc.0 image --- build/dependencies.yaml | 2 +- cluster/images/etcd/Makefile | 4 ++-- cluster/images/etcd/migrate/options.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4a2a0cafdd4..88ff2963eb0 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.17 + version: 3.6.0-rc.0 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 bdf1371bd55..4cf5d0eaaee 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.17 +BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17 3.6.0-rc.0 # LATEST_ETCD_VERSION identifies the most recent etcd version available. -LATEST_ETCD_VERSION?=3.5.17 +LATEST_ETCD_VERSION?=3.6.0-rc.0 # 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 a08ab0e9221..9c9e08212b7 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.17"} + supportedEtcdVersions = []string{"3.4.18", "3.5.17", "3.6.0-rc.0"} ) const (