Skip to content

Update etcd to v3.6.5 for K8s 1.34+ #17637

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
merged 2 commits into from
Oct 2, 2025
+599 −2,829
Merged

Update etcd to v3.6.5 for K8s 1.34+ #17637

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
99e0357
Update etcd to v3.6.5 for K8s 1.34+
hakman Oct 2, 2025
ad44011
hack/update-expected.sh
hakman Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 @@ -30,7 +30,7 @@ var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}

const (
DefaultEtcd3Version_1_22 = "3.5.21"
DefaultEtcd3Version_1_34 = "3.6.4"
DefaultEtcd3Version_1_34 = "3.6.5"
)

// BuildOptions is responsible for filling in the defaults for the etcd cluster model
Expand Down
3 changes: 1 addition & 2 deletions pkg/model/components/etcdmanager/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ var etcdSupportedImages = []etcdVersion{
{Version: "3.5.13", SymlinkToVersion: "3.5.21"},
{Version: "3.5.17", SymlinkToVersion: "3.5.21"},
{Version: "3.5.21", Image: "registry.k8s.io/etcd:v3.5.21"},
{Version: "3.6.1", SymlinkToVersion: "3.6.4"},
{Version: "3.6.4", Image: "registry.k8s.io/etcd:v3.6.4"},
{Version: "3.6.5", Image: "registry.k8s.io/etcd:v3.6.5"},
}

func etcdSupportedVersions() []etcdVersion {
Expand Down
38 changes: 6 additions & 32 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 @@ -144,13 +144,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -189,19 +189,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down Expand Up @@ -312,13 +299,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -357,19 +344,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down
20 changes: 8 additions & 12 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 @@ -126,10 +126,8 @@ Contents: |
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.6.1
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.4
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -163,8 +161,8 @@ Contents: |
name: etcd-v3-5-21
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.4
name: etcd-v3-6-4
reference: registry.k8s.io/etcd:v3.6.5
name: etcd-v3-6-5
- hostPath:
path: /var/log/etcd-events.log
type: FileOrCreate
Expand Down Expand Up @@ -238,10 +236,8 @@ Contents: |
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.6.1
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.4
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -275,8 +271,8 @@ Contents: |
name: etcd-v3-5-21
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.4
name: etcd-v3-6-4
reference: registry.k8s.io/etcd:v3.6.5
name: etcd-v3-6-5
- hostPath:
path: /var/log/etcd.log
type: FileOrCreate
Expand Down
38 changes: 6 additions & 32 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 @@ -146,13 +146,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -191,19 +191,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down Expand Up @@ -316,13 +303,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -361,19 +348,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down
38 changes: 6 additions & 32 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 @@ -152,13 +152,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -197,19 +197,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down Expand Up @@ -328,13 +315,13 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.4
- --target-dir=/opt/etcd-v3.6.5
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.4
name: init-etcd-3-6-4
image: registry.k8s.io/etcd:v3.6.5
name: init-etcd-3-6-5
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -373,19 +360,6 @@ Contents: |
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.1
- --src=/opt/etcd-v3.6.4/etcd
- --src=/opt/etcd-v3.6.4/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
name: init-etcd-symlinks-3-6-4
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
priorityClassName: system-cluster-critical
tolerations:
- key: CriticalAddonsOnly
Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
backupRetentionDays: 90
memoryRequest: 100Mi
name: main
version: 3.6.4
version: 3.6.5
- backups:
backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
cpuRequest: 100m
Expand All @@ -54,7 +54,7 @@ spec:
backupRetentionDays: 90
memoryRequest: 100Mi
name: events
version: 3.6.4
version: 3.6.5
externalDns:
provider: dns-controller
iam:
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.6.4"
"etcdVersion": "3.6.5"
}
2 changes: 1 addition & 1 deletion ...ration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.6.4"
"etcdVersion": "3.6.5"
}
10 changes: 4 additions & 6 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 @@ -63,10 +63,8 @@ spec:
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.6.1
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.4
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -100,8 +98,8 @@ spec:
name: etcd-v3-5-21
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.4
name: etcd-v3-6-4
reference: registry.k8s.io/etcd:v3.6.5
name: etcd-v3-6-5
- hostPath:
path: /var/log/etcd-events.log
type: FileOrCreate
Expand Down
10 changes: 4 additions & 6 deletions ...additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,8 @@ spec:
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-21
- mountPath: /opt/etcd-v3.6.1
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.4
name: etcd-v3-6-4
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-5
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -100,8 +98,8 @@ spec:
name: etcd-v3-5-21
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.4
name: etcd-v3-6-4
reference: registry.k8s.io/etcd:v3.6.5
name: etcd-v3-6-5
- hostPath:
path: /var/log/etcd.log
type: FileOrCreate
Expand Down
4 changes: 2 additions & 2 deletions ...tegration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
manager:
backupRetentionDays: 90
name: main
version: 3.6.4
version: 3.6.5
- backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events
etcdMembers:
Expand All @@ -48,7 +48,7 @@ spec:
manager:
backupRetentionDays: 90
name: events
version: 3.6.4
version: 3.6.5
externalDns:
provider: dns-controller
iam:
Expand Down
2 changes: 1 addition & 1 deletion ...gration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.6.4"
"etcdVersion": "3.6.5"
}
2 changes: 1 addition & 1 deletion ...tegration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.6.4"
"etcdVersion": "3.6.5"
}
Loading
Loading