From 373866eee99537dcb7c8427df4b48e8b92e9b711 Mon Sep 17 00:00:00 2001
From: bzsuni <bingzhe.sun@daocloud.io>
Date: Fri, 28 Mar 2025 01:32:50 +0000
Subject: [PATCH] Build etcd v3.6.0-rc.4 image

Signed-off-by: bzsuni <bingzhe.sun@daocloud.io>
---
 build/dependencies.yaml                | 4 ++--
 cluster/images/etcd/Makefile           | 8 ++++----
 cluster/images/etcd/migrate/options.go | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index c7d37db5e19..2e54663a4bf 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.21
+    version: 3.6.0-rc.4
     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.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
+    version: 1.23.8 # 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 6e7ab539bf0..79015b9a6c5 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] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21 3.6.0-rc.4] [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,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
+BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21 3.6.0-rc.4
 
 # LATEST_ETCD_VERSION identifies the most recent etcd version available.
-LATEST_ETCD_VERSION?=3.5.21
+LATEST_ETCD_VERSION?=3.6.0-rc.4
 
 # 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.23.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
+GOLANG_VERSION := 1.23.8 # 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 ccb73d26845..6633990edb0 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"}
+	supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.0-rc.4"}
 )
 
 const (