From df503e54c8515ead931dea4c3d7607d111fb7683 Mon Sep 17 00:00:00 2001 From: bzsuni Date: Wed, 13 Nov 2024 02:19:08 +0000 Subject: [PATCH] Update etcd from v3.5.16 to v3.5.17 Signed-off-by: bzsuni --- build/dependencies.yaml | 2 +- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 10 +++++----- hack/lib/etcd.sh | 2 +- .../sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3c9623f2c30..78db8df52fe 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -64,7 +64,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.16 + version: 3.5.17 refPaths: - path: cluster/gce/manifests/etcd.manifest match: etcd_docker_tag|etcd_version diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index d0389c0f103..9fa76f31330 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -18,7 +18,7 @@ { "name": "etcd-container", {{security_context}} - "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.16-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.17-0') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -34,7 +34,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.5.16') }}" + "value": "{{ pillar.get('etcd_version', '3.5.17') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 7d01fba61d0..e36b999624a 100755 --- a/cluster/gce/upgrade-aliases.sh +++ b/cluster/gce/upgrade-aliases.sh @@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true export SECONDARY_RANGE_NAME="pods-default" export STORAGE_BACKEND="etcd3" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" -export ETCD_IMAGE=3.5.16-0 -export ETCD_VERSION=3.5.16 +export ETCD_IMAGE=3.5.17-0 +export ETCD_VERSION=3.5.17 # Upgrade master with updated kube envs "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index e4af1713880..ad73ca3e72f 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -326,7 +326,7 @@ const ( MinExternalEtcdVersion = "3.5.11-0" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.16-0" + DefaultEtcdVersion = "3.5.17-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -495,10 +495,10 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases SupportedEtcdVersion = map[uint8]string{ - 30: "3.5.16-0", - 31: "3.5.16-0", - 32: "3.5.16-0", - 33: "3.5.16-0", + 30: "3.5.17-0", + 31: "3.5.17-0", + 32: "3.5.17-0", + 33: "3.5.17-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 6dbdfabc20e..0a954772b57 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -16,7 +16,7 @@ # A set of helpers for starting/running etcd for tests -ETCD_VERSION=${ETCD_VERSION:-3.5.16} +ETCD_VERSION=${ETCD_VERSION:-3.5.17} ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-2379} # This is intentionally not called ETCD_LOG_LEVEL: diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index eee160a6d18..535f120a950 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -26,4 +26,4 @@ spec: imagePullPolicy: Never args: [ "--etcd-servers=http://localhost:2379" ] - name: etcd - image: gcr.io/etcd-development/etcd:v3.5.16 + image: gcr.io/etcd-development/etcd:v3.5.17 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 2d3bc9fa437..31ed1ac3671 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -224,7 +224,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.6"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.16-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.17-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"}