Skip to content

Commit cd06097

Browse files
authored
Merge pull request kubernetes#130651 from ahrtr/rc2_20250307
Build etcd v3.6.0-rc.2 image
2 parents 83b696c + 337f1c2 commit cd06097

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ dependencies:
8080
match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"}
8181

8282
- name: "etcd-image"
83-
version: 3.6.0-rc.1
83+
version: 3.6.0-rc.2
8484
refPaths:
8585
- path: cluster/images/etcd/Makefile
8686
match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?

cluster/images/etcd/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also
2727
# need etcd and etcdctl binaries for backward compatibility reasons.
2828
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
29-
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17 3.6.0-rc.1
29+
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17 3.6.0-rc.2
3030

3131
# LATEST_ETCD_VERSION identifies the most recent etcd version available.
32-
LATEST_ETCD_VERSION?=3.6.0-rc.1
32+
LATEST_ETCD_VERSION?=3.6.0-rc.2
3333

3434
# REVISION provides a version number for this image and all it's bundled
3535
# artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment

cluster/images/etcd/migrate/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
)
2929

3030
var (
31-
supportedEtcdVersions = []string{"3.4.18", "3.5.17", "3.6.0-rc.1"}
31+
supportedEtcdVersions = []string{"3.4.18", "3.5.17", "3.6.0-rc.2"}
3232
)
3333

3434
const (

0 commit comments

Comments
 (0)