From 07ef65a834dd4b45ac08164715bcd523bfc6142a Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 30 May 2024 10:24:21 +0530 Subject: [PATCH] make use of etcd v3.5.14 in the builds. https://github.com/etcd-io/etcd/releases/tag/v3.5.14 This release has been built with GO 1.21.10 Signed-off-by: Humble Chirammal --- build/dependencies.yaml | 2 +- cluster/gce/manifests/etcd.manifest | 2 +- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 8 ++++---- hack/lib/etcd.sh | 2 +- .../sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f3e9ed8c1cf..f64d98c0b6a 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -64,7 +64,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.13 + version: 3.5.14 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 6fe2b79be5d..16949e2ada1 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.13-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.14-0') }}", "resources": { "requests": { "cpu": {{ cpulimit }} diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 5ed8ea162b0..dca4c12f694 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.13-0 -export ETCD_VERSION=3.5.13 +export ETCD_IMAGE=3.5.14-0 +export ETCD_VERSION=3.5.14 # 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 4b0905ff389..0e161331d87 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -322,7 +322,7 @@ const ( MinExternalEtcdVersion = "3.5.11-0" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.13-0" + DefaultEtcdVersion = "3.5.14-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -481,9 +481,9 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases SupportedEtcdVersion = map[uint8]string{ - 29: "3.5.13-0", - 30: "3.5.13-0", - 31: "3.5.13-0", + 29: "3.5.14-0", + 30: "3.5.14-0", + 31: "3.5.14-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index da4e1d90ce2..b190a4ea135 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.13} +ETCD_VERSION=${ETCD_VERSION:-3.5.14} 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 81cdb36d557..ee95a177d12 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.13 + image: gcr.io/etcd-development/etcd:v3.5.14 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 517f483f42f..744474d68cd 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -236,7 +236,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.5.4"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.13-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.14-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"}