From a99148c88077cd8195a92988e6d219bbe3092937 Mon Sep 17 00:00:00 2001 From: bzsuni Date: Tue, 6 Feb 2024 17:51:21 +0800 Subject: [PATCH] etcd: Update to version 3.5.12 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 | 19 ++++++++++--------- hack/lib/etcd.sh | 2 +- .../artifacts/example/deployment.yaml | 2 +- test/e2e/framework/providers/gcp.go | 2 +- test/utils/image/manifest.go | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index e99ac57190b..6d7995e006c 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -64,7 +64,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.10 + version: 3.5.12 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 59cf132f380..7af62598d3a 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.10-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.12-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.10') }}" + "value": "{{ pillar.get('etcd_version', '3.5.12') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 0f81f0aa527..6698c43649e 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.10-0 -export ETCD_VERSION=3.5.10 +export ETCD_IMAGE=3.5.12-0 +export ETCD_VERSION=3.5.12 # 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 2678a5be4f8..64913b943db 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -309,7 +309,7 @@ const ( MinExternalEtcdVersion = "3.4.13-4" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.10-0" + DefaultEtcdVersion = "3.5.12-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -464,14 +464,15 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases SupportedEtcdVersion = map[uint8]string{ - 22: "3.5.10-0", - 23: "3.5.10-0", - 24: "3.5.10-0", - 25: "3.5.10-0", - 26: "3.5.10-0", - 27: "3.5.10-0", - 28: "3.5.10-0", - 29: "3.5.10-0", + 22: "3.5.12-0", + 23: "3.5.12-0", + 24: "3.5.12-0", + 25: "3.5.12-0", + 26: "3.5.12-0", + 27: "3.5.12-0", + 28: "3.5.12-0", + 29: "3.5.12-0", + 30: "3.5.12-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 6e2f02c002c..9339b6b44bb 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.10} +ETCD_VERSION=${ETCD_VERSION:-3.5.12} 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 9ba278999de..a12c9a0cc98 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.10 + image: gcr.io/etcd-development/etcd:v3.5.12 diff --git a/test/e2e/framework/providers/gcp.go b/test/e2e/framework/providers/gcp.go index 221ba14b5c8..181c3f2fefd 100644 --- a/test/e2e/framework/providers/gcp.go +++ b/test/e2e/framework/providers/gcp.go @@ -26,7 +26,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" ) -const etcdImage = "3.5.10-0" +const etcdImage = "3.5.12-0" // EtcdUpgrade upgrades etcd on GCE. func EtcdUpgrade(targetStorage, targetVersion string) error { diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index d5a084478c3..15cf2b95f9a 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -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[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.5"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.10-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-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"}