Merge pull request #133225 from ivanvc/build-etcd-3.6.4

k8s-ci-robot · web-flow · commit 7cc3faf39d89 · 2025-07-25T21:46:27.000-07:00
Build etcd v3.6.4 image
diff --git 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.3
+    version: 3.6.4
     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
@@ -15,7 +15,7 @@
 # Build the etcd image
 #
 # Usage:
-# 	[BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21 3.6.3] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21 3.6.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 3.6.3
+BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21 3.6.4
 
 # LATEST_ETCD_VERSION identifies the most recent etcd version available.
-LATEST_ETCD_VERSION?=3.6.3
+LATEST_ETCD_VERSION?=3.6.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
diff --git 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.3"}
+	supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.4"}
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var (`
`31`		`- supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.3"}`
	`31`	`+ supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.4"}`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`const (`