From 3f85937b114afe8f7401de8d9756cd2a58ccffab Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 13 Apr 2022 16:48:27 -0400 Subject: [PATCH] etcd: Update to v3.5.3 Signed-off-by: Stephen Augustus --- build/dependencies.yaml | 3 ++- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 7 ++++--- hack/lib/etcd.sh | 2 +- .../sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/e2e/framework/nodes_util.go | 2 +- test/utils/image/manifest.go | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f73d1e25f73ed..1170012a9b12c 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -55,13 +55,14 @@ dependencies: # etcd - name: "etcd" - version: 3.5.1 + version: 3.5.3 refPaths: - path: cluster/gce/manifests/etcd.manifest match: etcd_docker_tag|etcd_version - path: cluster/gce/upgrade-aliases.sh match: ETCD_IMAGE|ETCD_VERSION - path: cmd/kubeadm/app/constants/constants.go + match: DefaultEtcdVersion = - path: hack/lib/etcd.sh match: ETCD_VERSION= - path: staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index ed52f138c8ed6..3be6ed9a0e702 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', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.1-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.3-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.1') }}" + "value": "{{ pillar.get('etcd_version', '3.5.3') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index a383f6a76d59a..1ffc9c6099ef5 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.1-0 -export ETCD_VERSION=3.5.1 +export ETCD_IMAGE=3.5.3-0 +export ETCD_VERSION=3.5.3 # 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 dc21edfe2dd5a..3fa0c9b9f5bc1 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -320,7 +320,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.1-0" + DefaultEtcdVersion = "3.5.3-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -498,8 +498,9 @@ var ( 19: "3.4.13-0", 20: "3.4.13-0", 21: "3.4.13-0", - 22: "3.5.1-0", - 23: "3.5.1-0", + 22: "3.5.3-0", + 23: "3.5.3-0", + 24: "3.5.3-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index e799c89aab737..d4752b3c598ea 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.1} +ETCD_VERSION=${ETCD_VERSION:-3.5.3} 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 afee5d7f4cd25..a940b3aa5fcc1 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: quay.io/coreos/etcd:v3.5.1 + image: quay.io/coreos/etcd:v3.5.3 diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 43fe34df895b5..b58c4e5d8bfed 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -34,7 +34,7 @@ import ( e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) -const etcdImage = "3.5.1-0" +const etcdImage = "3.5.3-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 b068017b93c26..820c1597d5d6c 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -242,7 +242,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) { configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.1-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.3-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-2"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-2"}