From e3eb4bd0c5603ed49a4dbe37ec4c1bf1f52aa5e7 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 16 May 2023 20:18:52 +0530 Subject: [PATCH] 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 | 3 ++- .../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(+), 9 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 8e62ba27396..3f3a614caf7 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -62,7 +62,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.8 + 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 c6e8458183d..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.8-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.8') }}" + "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 1249386a99f..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.8-0 -export ETCD_VERSION=3.5.8 +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 e82a1af5b5f..b787b36ba50 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.8-0" + DefaultEtcdVersion = "3.5.9-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -482,6 +482,7 @@ var ( 25: "3.5.8-0", 26: "3.5.8-0", 27: "3.5.8-0", + 28: "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 a6686ee8e63..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.8 + 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 f3f01a8bab9..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.8-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 c116d271441..9e6222f6fa1 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.4"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.8-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"}