Skip to content

Commit 24edc6e

Browse files
committed
Update etcd to 3.5.21
Signed-off-by: joshjms <[email protected]>
1 parent ef7d51e commit 24edc6e

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies:
6464

6565
# etcd
6666
- name: "etcd"
67-
version: 3.5.17
67+
version: 3.5.21
6868
refPaths:
6969
- path: cluster/gce/manifests/etcd.manifest
7070
match: etcd_docker_tag|etcd_version

cluster/gce/manifests/etcd.manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{
1919
"name": "etcd-container",
2020
{{security_context}}
21-
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.17-0') }}",
21+
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.21-0') }}",
2222
"resources": {
2323
"requests": {
2424
"cpu": {{ cpulimit }}
@@ -34,7 +34,7 @@
3434
"value": "{{ pillar.get('storage_backend', 'etcd3') }}"
3535
},
3636
{ "name": "TARGET_VERSION",
37-
"value": "{{ pillar.get('etcd_version', '3.5.17') }}"
37+
"value": "{{ pillar.get('etcd_version', '3.5.21') }}"
3838
},
3939
{
4040
"name": "DO_NOT_MOVE_BINARIES",

cluster/gce/upgrade-aliases.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
170170
export SECONDARY_RANGE_NAME="pods-default"
171171
export STORAGE_BACKEND="etcd3"
172172
export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
173-
export ETCD_IMAGE=3.5.17-0
174-
export ETCD_VERSION=3.5.17
173+
export ETCD_IMAGE=3.5.21-0
174+
export ETCD_VERSION=3.5.21
175175

176176
# Upgrade master with updated kube envs
177177
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

cmd/kubeadm/app/constants/constants.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ const (
326326
MinExternalEtcdVersion = "3.5.11-0"
327327

328328
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
329-
DefaultEtcdVersion = "3.5.17-0"
329+
DefaultEtcdVersion = "3.5.21-0"
330330

331331
// Etcd defines variable used internally when referring to etcd component
332332
Etcd = "etcd"
@@ -495,10 +495,10 @@ var (
495495

496496
// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
497497
SupportedEtcdVersion = map[uint8]string{
498-
30: "3.5.17-0",
499-
31: "3.5.17-0",
500-
32: "3.5.17-0",
501-
33: "3.5.17-0",
498+
30: "3.5.21-0",
499+
31: "3.5.21-0",
500+
32: "3.5.21-0",
501+
33: "3.5.21-0",
502502
}
503503

504504
// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows

hack/lib/etcd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# A set of helpers for starting/running etcd for tests
1818

19-
ETCD_VERSION=${ETCD_VERSION:-3.5.17}
19+
ETCD_VERSION=${ETCD_VERSION:-3.5.21}
2020
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
2121
ETCD_PORT=${ETCD_PORT:-2379}
2222
# This is intentionally not called ETCD_LOG_LEVEL:

staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ spec:
2626
imagePullPolicy: Never
2727
args: [ "--etcd-servers=http://localhost:2379" ]
2828
- name: etcd
29-
image: gcr.io/etcd-development/etcd:v3.5.17
29+
image: gcr.io/etcd-development/etcd:v3.5.21

test/utils/image/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
224224
configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
225225
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
226226
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.3"}
227-
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.17-0"}
227+
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.21-0"}
228228
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
229229
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
230230
configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"}

0 commit comments

Comments
 (0)