Skip to content

Commit a78542e

Browse files
authored
Merge pull request kubernetes#125209 from humblec/etcd-3.5.14
make use of etcd v3.5.14 in the builds.
2 parents f386b4c + 07ef65a commit a78542e

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
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.13
67+
version: 3.5.14
6868
refPaths:
6969
- path: cluster/gce/manifests/etcd.manifest
7070
match: etcd_docker_tag|etcd_version

cluster/gce/manifests/etcd.manifest

Lines changed: 1 addition & 1 deletion
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.13-0') }}",
21+
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.14-0') }}",
2222
"resources": {
2323
"requests": {
2424
"cpu": {{ cpulimit }}

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.13-0
174-
export ETCD_VERSION=3.5.13
173+
export ETCD_IMAGE=3.5.14-0
174+
export ETCD_VERSION=3.5.14
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ const (
322322
MinExternalEtcdVersion = "3.5.11-0"
323323

324324
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
325-
DefaultEtcdVersion = "3.5.13-0"
325+
DefaultEtcdVersion = "3.5.14-0"
326326

327327
// Etcd defines variable used internally when referring to etcd component
328328
Etcd = "etcd"
@@ -481,9 +481,9 @@ var (
481481

482482
// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
483483
SupportedEtcdVersion = map[uint8]string{
484-
29: "3.5.13-0",
485-
30: "3.5.13-0",
486-
31: "3.5.13-0",
484+
29: "3.5.14-0",
485+
30: "3.5.14-0",
486+
31: "3.5.14-0",
487487
}
488488

489489
// 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.13}
19+
ETCD_VERSION=${ETCD_VERSION:-3.5.14}
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.13
29+
image: gcr.io/etcd-development/etcd:v3.5.14

test/utils/image/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
236236
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
237237
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
238238
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.4"}
239-
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.13-0"}
239+
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.14-0"}
240240
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
241241
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
242242
configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"}

0 commit comments

Comments
 (0)