upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-02-03 20:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

etcd: Update etcd to v3.6.7

Browse source 
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 <humble.devassy@gmail.com>
This commit is contained in:
Humble Devassy Chirammal 2025-12-18 12:17:50 +05:30
parent 1d45317959
commit 8dc8edf49b
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/dependencies.yaml
View file

@ -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

4
cluster/gce/manifests/etcd.manifest
View file

@ -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",

4
cluster/gce/upgrade-aliases.sh
View file

@ -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

8
cmd/kubeadm/app/constants/constants.go
View file

@ -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

2
hack/lib/etcd.sh
View file

@ -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:

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

@ -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

2
test/utils/image/manifest.go
View file

@ -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"}