github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122393 from mzaian/etcd-3511

Browse Source 
etcd: Update to version 3.5.11
This commit is contained in:
Kubernetes Prow Robot
2023-12-21 06:41:55 +01:00
committed by GitHub
parent c6f4ff6df8 c8a2d5684d
commit 0d530551bc
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@@ -64,7 +64,7 @@ dependencies:
# etcd # etcd
- name: "etcd" - name: "etcd"
version: 3.5.10 version: 3.5.11
refPaths: refPaths:
- path: cluster/gce/manifests/etcd.manifest - path: cluster/gce/manifests/etcd.manifest
match: etcd_docker_tag|etcd_version match: etcd_docker_tag|etcd_version

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

@@ -18,7 +18,7 @@
{ {
"name": "etcd-container", "name": "etcd-container",
{{security_context}} {{security_context}}
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.10-0') }}", "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.11-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
@@ -34,7 +34,7 @@
"value": "{{ pillar.get('storage_backend', 'etcd3') }}" "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
}, },
{ "name": "TARGET_VERSION", { "name": "TARGET_VERSION",
"value": "{{ pillar.get('etcd_version', '3.5.10') }}" "value": "{{ pillar.get('etcd_version', '3.5.11') }}"
}, },
{ {
"name": "DO_NOT_MOVE_BINARIES", "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 SECONDARY_RANGE_NAME="pods-default"
export STORAGE_BACKEND="etcd3" export STORAGE_BACKEND="etcd3"
export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
export ETCD_IMAGE=3.5.10-0 export ETCD_IMAGE=3.5.11-0
export ETCD_VERSION=3.5.10 export ETCD_VERSION=3.5.11
# Upgrade master with updated kube envs # Upgrade master with updated kube envs
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

18
cmd/kubeadm/app/constants/constants.go
View File

@@ -309,7 +309,7 @@ const (
MinExternalEtcdVersion = "3.4.13-4" MinExternalEtcdVersion = "3.4.13-4"
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.5.10-0" DefaultEtcdVersion = "3.5.11-0"
// Etcd defines variable used internally when referring to etcd component // Etcd defines variable used internally when referring to etcd component
Etcd = "etcd" Etcd = "etcd"
@@ -464,14 +464,14 @@ var (
// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
SupportedEtcdVersion = map[uint8]string{ SupportedEtcdVersion = map[uint8]string{
22: "3.5.10-0", 22: "3.5.11-0",
23: "3.5.10-0", 23: "3.5.11-0",
24: "3.5.10-0", 24: "3.5.11-0",
25: "3.5.10-0", 25: "3.5.11-0",
26: "3.5.10-0", 26: "3.5.11-0",
27: "3.5.10-0", 27: "3.5.11-0",
28: "3.5.10-0", 28: "3.5.11-0",
29: "3.5.10-0", 29: "3.5.11-0",
30: "3.5.11-0", 30: "3.5.11-0",
} }

2
hack/lib/etcd.sh
View File

@@ -16,7 +16,7 @@
# A set of helpers for starting/running etcd for tests # A set of helpers for starting/running etcd for tests
ETCD_VERSION=${ETCD_VERSION:-3.5.10} ETCD_VERSION=${ETCD_VERSION:-3.5.11}
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}
# This is intentionally not called ETCD_LOG_LEVEL: # 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 imagePullPolicy: Never
args: [ "--etcd-servers=http://localhost:2379" ] args: [ "--etcd-servers=http://localhost:2379" ]
- name: etcd - name: etcd
image: gcr.io/etcd-development/etcd:v3.5.10 image: gcr.io/etcd-development/etcd:v3.5.11

2
test/e2e/framework/providers/gcp.go
View File

@@ -26,7 +26,7 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2enode "k8s.io/kubernetes/test/e2e/framework/node"
) )
const etcdImage = "3.5.10-0" const etcdImage = "3.5.11-0"
// EtcdUpgrade upgrades etcd on GCE. // EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error { func EtcdUpgrade(targetStorage, targetVersion string) error {

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

@@ -242,7 +242,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.3"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.3"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.10-0"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.11-0"}
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"} configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"}