From 75f89875f8a2c992e65b4e516c36c0570f838d9d Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Thu, 24 Nov 2022 09:45:56 +0800 Subject: [PATCH] use etcd 3.5.6-0 after promotion --- 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/e2e/framework/providers/gcp.go | 2 +- test/utils/image/manifest.go | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f41f66379d4..c4d0afaa7f8 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -55,7 +55,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.5 + version: 3.5.6 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 97e27456df2..ecd8b9c3d40 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.5-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.6-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.5') }}" + "value": "{{ pillar.get('etcd_version', '3.5.6') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index f7796504798..374420dd00c 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.5-0 -export ETCD_VERSION=3.5.5 +export ETCD_IMAGE=3.5.6-0 +export ETCD_VERSION=3.5.6 # 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 b87d11284b4..c8fc46c8a44 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -309,7 +309,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.5-0" + DefaultEtcdVersion = "3.5.6-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -476,10 +476,10 @@ var ( 19: "3.4.13-0", 20: "3.4.13-0", 21: "3.4.13-0", - 22: "3.5.5-0", - 23: "3.5.5-0", - 24: "3.5.5-0", - 25: "3.5.5-0", + 22: "3.5.6-0", + 23: "3.5.6-0", + 24: "3.5.6-0", + 25: "3.5.6-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 44ceb46af05..34e8c92373c 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.5} +ETCD_VERSION=${ETCD_VERSION:-3.5.6} 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 386ec4e79a2..ce17634fb3f 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.5 + image: gcr.io/etcd-development/etcd:v3.5.6 diff --git a/test/e2e/framework/providers/gcp.go b/test/e2e/framework/providers/gcp.go index 01078995c40..86e843d5be0 100644 --- a/test/e2e/framework/providers/gcp.go +++ b/test/e2e/framework/providers/gcp.go @@ -25,7 +25,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" ) -const etcdImage = "3.5.5-0" +const etcdImage = "3.5.6-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 61a96a563bf..974c21af843 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -241,7 +241,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.2"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.1.2"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-1"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.6-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}