From 1db6e434f3aba8e71d3785d6d985cc3e08f0fdc3 Mon Sep 17 00:00:00 2001 From: bzsuni Date: Thu, 1 Feb 2024 14:34:01 +0800 Subject: [PATCH] build etcd image v3.5.12 Signed-off-by: bzsuni --- build/dependencies.yaml | 4 ++-- cluster/images/etcd/Makefile | 6 +++--- cluster/images/etcd/migrate/options.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index a52a040ee67..c3f7fbcafeb 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -82,7 +82,7 @@ dependencies: match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"} - name: "etcd-image" - version: 3.5.11 + version: 3.5.12 refPaths: - path: cluster/images/etcd/Makefile match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\? @@ -111,7 +111,7 @@ dependencies: # From https://github.com/etcd-io/etcd/blob/main/Makefile - name: "golang: etcd release version" - version: 1.20.12 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md + version: 1.20.13 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.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 07a2b5d533f..0360c6f8991 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.11 +BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.12 # LATEST_ETCD_VERSION identifies the most recent etcd version available. -LATEST_ETCD_VERSION?=3.5.11 +LATEST_ETCD_VERSION?=3.5.12 # 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 @@ -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.20.12 +GOLANG_VERSION := 1.20.13 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go index 55e6138bc7f..5b6b005ab69 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.11"} + supportedEtcdVersions = []string{"3.4.18", "3.5.12"} ) const (