Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

etcd: Update to version 3.5.11 #122393

Merged
merged 1 commit into from
Dec 21, 2023
Merged

etcd: Update to version 3.5.11 #122393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ dependencies:

# etcd
- name: "etcd"
version: 3.5.10
version: 3.5.11
refPaths:
- path: cluster/gce/manifests/etcd.manifest
match: etcd_docker_tag|etcd_version
Expand Down
4 changes: 2 additions & 2 deletions cluster/gce/manifests/etcd.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10-0') }}",
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.11-0') }}",
"resources": {
"requests": {
"cpu": {{ cpulimit }}
Expand All @@ -34,7 +34,7 @@
"value": "{{ pillar.get('storage_backend', 'etcd3') }}"
},
{ "name": "TARGET_VERSION",
"value": "{{ pillar.get('etcd_version', '3.5.10') }}"
"value": "{{ pillar.get('etcd_version', '3.5.11') }}"
},
{
"name": "DO_NOT_MOVE_BINARIES",
Expand Down
4 changes: 2 additions & 2 deletions cluster/gce/upgrade-aliases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10-0
export ETCD_VERSION=3.5.10
export ETCD_IMAGE=3.5.11-0
export ETCD_VERSION=3.5.11

# Upgrade master with updated kube envs
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l
Expand Down
18 changes: 9 additions & 9 deletions cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ const (
MinExternalEtcdVersion = "3.4.13-4"

// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.5.10-0"
DefaultEtcdVersion = "3.5.11-0"

// Etcd defines variable used internally when referring to etcd component
Etcd = "etcd"
Expand Down Expand Up @@ -464,14 +464,14 @@ var (

// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
SupportedEtcdVersion = map[uint8]string{
22: "3.5.10-0",
23: "3.5.10-0",
24: "3.5.10-0",
25: "3.5.10-0",
26: "3.5.10-0",
27: "3.5.10-0",
28: "3.5.10-0",
29: "3.5.10-0",
22: "3.5.11-0",
23: "3.5.11-0",
24: "3.5.11-0",
25: "3.5.11-0",
26: "3.5.11-0",
27: "3.5.11-0",
28: "3.5.11-0",
29: "3.5.11-0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @SataQiu
maybe we can handle the upgrade in this PR?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link #122265

30: "3.5.11-0",
}

Expand Down
2 changes: 1 addition & 1 deletion hack/lib/etcd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# A set of helpers for starting/running etcd for tests

ETCD_VERSION=${ETCD_VERSION:-3.5.10}
ETCD_VERSION=${ETCD_VERSION:-3.5.11}
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379}
# This is intentionally not called ETCD_LOG_LEVEL:
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ spec:
imagePullPolicy: Never
args: [ "--etcd-servers=http://localhost:2379" ]
- name: etcd
image: gcr.io/etcd-development/etcd:v3.5.10
image: gcr.io/etcd-development/etcd:v3.5.11
2 changes: 1 addition & 1 deletion test/e2e/framework/providers/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
)

const etcdImage = "3.5.10-0"
const etcdImage = "3.5.11-0"

// EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error {
Expand Down
2 changes: 1 addition & 1 deletion test/utils/image/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,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.4.3"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.10-0"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.11-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"}
Expand Down