From b1a35c640ebc9e1a16769a90c30ea24c0958314d Mon Sep 17 00:00:00 2001 From: bzsuni Date: Thu, 10 Jul 2025 09:15:11 +0000 Subject: [PATCH] Build etcd image v3.6.2 Signed-off-by: bzsuni --- build/dependencies.yaml | 4 ++-- cluster/images/etcd/Makefile | 10 +++++----- cluster/images/etcd/migrate/options.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 0368c9e4ca3..81b1e41a4a4 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.6.1 + version: 3.6.2 refPaths: - path: cluster/images/etcd/Makefile match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\? @@ -109,7 +109,7 @@ dependencies: # From https://github.com/etcd-io/etcd/blob/main/Makefile - name: "golang: etcd release version" - version: 1.23.10 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md + version: 1.23.11 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md refPaths: - path: cluster/images/etcd/Makefile match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?' diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index fca778149cb..a046e1e17d6 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -15,7 +15,7 @@ # Build the etcd image # # Usage: -# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21 3.6.1] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) +# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21 3.6.2] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # # The image contains different etcd versions to simplify # upgrades. Thus be careful when removing any versions from here. @@ -26,15 +26,15 @@ # 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.1 +BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21 3.6.2 # LATEST_ETCD_VERSION identifies the most recent etcd version available. -LATEST_ETCD_VERSION?=3.6.1 +LATEST_ETCD_VERSION?=3.6.2 # 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 # for each revision of this image at that etcd version. -REVISION?=1 +REVISION?=0 # IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) @@ -83,7 +83,7 @@ endif # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases. -GOLANG_VERSION := 1.23.10 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md +GOLANG_VERSION := 1.23.11 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md GOARM?=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go index 26be5d55a21..baa7b227956 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.1"} + supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.2"} ) const (