From 8dc8edf49bba5e5004a71d655235bc7b3d83d32f Mon Sep 17 00:00:00 2001 From: Humble Devassy Chirammal Date: Thu, 18 Dec 2025 12:17:50 +0530 Subject: [PATCH] etcd: Update etcd to v3.6.7 ETCD 3.6.7 has some critical bug fixes https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md Signed-off-by: Humble Devassy Chirammal --- build/dependencies.yaml | 2 +- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 8 ++++---- hack/lib/etcd.sh | 2 +- .../sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 695e1c2f3d4..36aa500eae6 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -64,7 +64,7 @@ dependencies: # etcd - name: "etcd" - version: 3.6.6 + version: 3.6.7 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 b73ee24a91f..5a88f18704e 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.6.6-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.6.7-0') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -43,7 +43,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.6.6') }}" + "value": "{{ pillar.get('etcd_version', '3.6.7') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index b8f2f4648c7..b8e018f08d9 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.6.6-0 -export ETCD_VERSION=3.6.6 +export ETCD_IMAGE=3.6.7-0 +export ETCD_VERSION=3.6.7 # 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 1d217c8701e..685ba804c11 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -326,7 +326,7 @@ const ( MinExternalEtcdVersion = "3.5.24-0" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.6.6-0" + DefaultEtcdVersion = "3.6.7-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -508,9 +508,9 @@ var ( // an etcd version even if the map is not yet updated before a release. The user will // get a warning in that case, so ideally the map should be updated for each release. SupportedEtcdVersion = map[uint8]string{ - 34: "3.6.6-0", - 35: "3.6.6-0", - 36: "3.6.6-0", + 34: "3.6.7-0", + 35: "3.6.7-0", + 36: "3.6.7-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index d97de5206aa..6f5bacd23e2 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.6.6} +ETCD_VERSION=${ETCD_VERSION:-3.6.7} 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 f0fa4380fc8..baf1fe9887f 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: registry.k8s.io/etcd:v3.6.6 + image: registry.k8s.io/etcd:v3.6.7 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 1cc2806a87f..c74bdd851e6 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -215,7 +215,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.37.0-1"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.8.6"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.6.6-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.6.7-0"} configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"} configs[IpcUtils] = Config{list.PromoterE2eRegistry, "ipc-utils", "1.3"} configs[JessieDnsutils] = Config{list.PromoterE2eRegistry, "jessie-dnsutils", "1.7"}