Skip to content

Automated cherry pick of #17720: Update etcd to v3.5.24 for K8s <1.34 #17721

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

Merged
k8s-ci-robot merged 2 commits into from
Nov 1, 2025
Merged

Automated cherry pick of #17720: Update etcd to v3.5.24 for K8s <1.34 #17721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8cc111
Update etcd to v3.5.24 for K8s <1.34
hakman Nov 1, 2025
8661fb8
hack/update-expected.sh
hakman Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct {
var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}

const (
DefaultEtcd3Version_1_22 = "3.5.23"
DefaultEtcd3Version_1_22 = "3.5.24"
DefaultEtcd3Version_1_34 = "3.6.5"
)

Expand Down
22 changes: 11 additions & 11 deletions pkg/model/components/etcdmanager/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ type etcdVersion struct {
var etcdSupportedImages = []etcdVersion{
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
{Version: "3.4.13", Image: "registry.k8s.io/etcd:v3.4.13"},
{Version: "3.5.0", SymlinkToVersion: "3.5.23"},
{Version: "3.5.1", SymlinkToVersion: "3.5.23"},
{Version: "3.5.3", SymlinkToVersion: "3.5.23"},
{Version: "3.5.4", SymlinkToVersion: "3.5.23"},
{Version: "3.5.6", SymlinkToVersion: "3.5.23"},
{Version: "3.5.7", SymlinkToVersion: "3.5.23"},
{Version: "3.5.9", SymlinkToVersion: "3.5.23"},
{Version: "3.5.13", SymlinkToVersion: "3.5.23"},
{Version: "3.5.17", SymlinkToVersion: "3.5.23"},
{Version: "3.5.21", SymlinkToVersion: "3.5.23"},
{Version: "3.5.23", Image: "registry.k8s.io/etcd:v3.5.23"},
{Version: "3.5.0", SymlinkToVersion: "3.5.24"},
{Version: "3.5.1", SymlinkToVersion: "3.5.24"},
{Version: "3.5.3", SymlinkToVersion: "3.5.24"},
{Version: "3.5.4", SymlinkToVersion: "3.5.24"},
{Version: "3.5.6", SymlinkToVersion: "3.5.24"},
{Version: "3.5.7", SymlinkToVersion: "3.5.24"},
{Version: "3.5.9", SymlinkToVersion: "3.5.24"},
{Version: "3.5.13", SymlinkToVersion: "3.5.24"},
{Version: "3.5.17", SymlinkToVersion: "3.5.24"},
{Version: "3.5.21", SymlinkToVersion: "3.5.24"},
{Version: "3.5.24", Image: "registry.k8s.io/etcd:v3.5.24"},
{Version: "3.6.5", Image: "registry.k8s.io/etcd:v3.6.5"},
}

Expand Down
24 changes: 12 additions & 12 deletions pkg/model/components/etcdmanager/tests/interval/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -179,12 +179,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -286,13 +286,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -334,12 +334,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
56 changes: 28 additions & 28 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,27 +106,27 @@ Contents: |
- mountPath: /opt/etcd-v3.4.3
name: etcd-v3-4-13
- mountPath: /opt/etcd-v3.5.0
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.1
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.13
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.17
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.21
name: etcd-v3-5-23
- mountPath: /opt/etcd-v3.5.23
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.24
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.3
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.4
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.6
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.7
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
Expand Down Expand Up @@ -158,8 +158,8 @@ Contents: |
name: etcd-v3-4-13
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.5.23
name: etcd-v3-5-23
reference: registry.k8s.io/etcd:v3.5.24
name: etcd-v3-5-24
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.5
Expand Down Expand Up @@ -217,27 +217,27 @@ Contents: |
- mountPath: /opt/etcd-v3.4.3
name: etcd-v3-4-13
- mountPath: /opt/etcd-v3.5.0
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.1
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.13
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.17
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.21
name: etcd-v3-5-23
- mountPath: /opt/etcd-v3.5.23
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.24
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.3
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.4
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.6
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.7
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
Expand Down Expand Up @@ -269,8 +269,8 @@ Contents: |
name: etcd-v3-4-13
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.5.23
name: etcd-v3-5-23
reference: registry.k8s.io/etcd:v3.5.24
name: etcd-v3-5-24
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.5
Expand Down
24 changes: 12 additions & 12 deletions pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -181,12 +181,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -290,13 +290,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -338,12 +338,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
24 changes: 12 additions & 12 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -187,12 +187,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -302,13 +302,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.23
name: init-etcd-3-5-23
image: registry.k8s.io/etcd:v3.5.24
name: init-etcd-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -350,12 +350,12 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.6
- --target-dir=/opt/etcd-v3.5.7
- --target-dir=/opt/etcd-v3.5.9
- --src=/opt/etcd-v3.5.23/etcd
- --src=/opt/etcd-v3.5.23/etcdctl
- --src=/opt/etcd-v3.5.24/etcd
- --src=/opt/etcd-v3.5.24/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0
name: init-etcd-symlinks-3-5-23
name: init-etcd-symlinks-3-5-24
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
28 changes: 14 additions & 14 deletions ...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@ spec:
- mountPath: /opt/etcd-v3.4.3
name: etcd-v3-4-13
- mountPath: /opt/etcd-v3.5.0
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.1
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.13
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.17
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.21
name: etcd-v3-5-23
- mountPath: /opt/etcd-v3.5.23
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.24
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.3
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.4
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.6
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.7
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-23
name: etcd-v3-5-24
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
Expand Down Expand Up @@ -95,8 +95,8 @@ spec:
name: etcd-v3-4-13
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.5.23
name: etcd-v3-5-23
reference: registry.k8s.io/etcd:v3.5.24
name: etcd-v3-5-24
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.5
Expand Down
Loading
Loading