From 2f26236f284dd6436447096d3b33ad941ce6c02f Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 16 May 2023 10:32:15 +0530 Subject: [PATCH 1/3] update etcd version in install.sh to 3.5.9 Signed-off-by: Humble Chirammal --- hack/lib/etcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 46cbecae6f9..8c36043f62f 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.7} +ETCD_VERSION=${ETCD_VERSION:-3.5.9} ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-2379} # This is intentionally not called ETCD_LOG_LEVEL: From af1225ab940363d287d2e59a83265add56cd6022 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 16 May 2023 10:34:19 +0530 Subject: [PATCH 2/3] use upstream etcd github path instead of redirecting one In the installation script we use coreos/etcd path which redirect to etcd-io/etcd. This commit replace the same. Signed-off-by: Humble Chirammal --- hack/lib/etcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 8c36043f62f..b242d24cebe 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -160,7 +160,7 @@ kube::etcd::install() { if [[ ${os} == "darwin" ]]; then download_file="etcd-v${ETCD_VERSION}-${os}-${arch}.zip" - url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}" + url="https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/${download_file}" kube::util::download_file "${url}" "${download_file}" unzip -o "${download_file}" ln -fns "etcd-v${ETCD_VERSION}-${os}-${arch}" etcd From 745418035d1aed6aa869de406a94ffd83ea22862 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 16 May 2023 20:18:52 +0530 Subject: [PATCH 3/3] updating dependencies.yaml for etcd v3.5.9 version Signed-off-by: Humble Chirammal --- build/dependencies.yaml | 2 +- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 4 ++-- .../k8s.io/sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/e2e/framework/providers/gcp.go | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 2cadd622739..c4e57c46c0e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -62,7 +62,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.7 + version: 3.5.9 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 ac4c1200159..3e9cd2f2a92 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.7-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.9-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.7') }}" + "value": "{{ pillar.get('etcd_version', '3.5.9') }}" }, { "name": "DO_NOT_MOVE_BINARIES", diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 2fe2effae7a..a15f4c4903c 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.7-0 -export ETCD_VERSION=3.5.7 +export ETCD_IMAGE=3.5.9-0 +export ETCD_VERSION=3.5.9 # 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 1146b67dd59..870c00f1bdf 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -311,7 +311,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.7-0" + DefaultEtcdVersion = "3.5.9-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -483,7 +483,7 @@ var ( 24: "3.5.7-0", 25: "3.5.7-0", 26: "3.5.7-0", - 27: "3.5.7-0", + 27: "3.5.9-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows 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 08712f9f358..d54e35b5887 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.7 + image: gcr.io/etcd-development/etcd:v3.5.9 diff --git a/test/e2e/framework/providers/gcp.go b/test/e2e/framework/providers/gcp.go index 2737ffa3306..1815ba0f720 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.7-0" +const etcdImage = "3.5.9-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 eae32ff5a11..5f3b5e40f1d 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -246,7 +246,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.2.3"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.7-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.9-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"}