Skip to content

Commit 20d6b51

Browse files
committed
Build etcd 3.5.21 image
Signed-off-by: joshjms <[email protected]>
1 parent bdda0a5 commit 20d6b51

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/dependencies.yaml

Lines changed: 2 additions & 2 deletions
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.2
83+
version: 3.5.21
8484
refPaths:
8585
- path: cluster/images/etcd/Makefile
8686
match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
@@ -109,7 +109,7 @@ dependencies:
109109

110110
# From https://github.com/etcd-io/etcd/blob/main/Makefile
111111
- name: "golang: etcd release version"
112-
version: 1.22.9 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
112+
version: 1.23.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
113113
refPaths:
114114
- path: cluster/images/etcd/Makefile
115115
match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'

cluster/images/etcd/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Build the etcd image
1616
#
1717
# Usage:
18-
# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.17] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
18+
# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.21] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
1919
#
2020
# The image contains different etcd versions to simplify
2121
# upgrades. Thus be careful when removing any versions from here.
@@ -26,7 +26,7 @@
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.2
29+
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.21 3.6.0-rc.2
3030

3131
# LATEST_ETCD_VERSION identifies the most recent etcd version available.
3232
LATEST_ETCD_VERSION?=3.6.0-rc.2
@@ -83,7 +83,7 @@ endif
8383
# This option is for running docker manifest command
8484
export DOCKER_CLI_EXPERIMENTAL := enabled
8585
# golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
86-
GOLANG_VERSION := 1.22.9
86+
GOLANG_VERSION := 1.23.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
8787
GOARM?=7
8888
TEMP_DIR:=$(shell mktemp -d)
8989

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.2"}
31+
supportedEtcdVersions = []string{"3.4.18", "3.5.21", "3.6.0-rc.2"}
3232
)
3333

3434
const (

0 commit comments

Comments
 (0)