Sitelet https://github.com/kubernetes/kops/pull/18332/files
Skip to content

etcd-manager: bump etcd to latest patches (3.5.30, 3.6.11) #18332

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 1 commit into from
May 13, 2026
Merged

etcd-manager: bump etcd to latest patches (3.5.30, 3.6.11) #18332

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.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions pkg/model/components/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ type EtcdOptionsBuilder struct {
var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}

const (
DefaultEtcd3Version_1_22 = "3.5.25"
DefaultEtcd3Version_1_34 = "3.6.6"
DefaultEtcd3Version_1_22 = "3.5.30"
DefaultEtcd3Version_1_34 = "3.6.11"
)

// BuildOptions is responsible for filling in the defaults for the etcd cluster model
Expand Down
32 changes: 17 additions & 15 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,21 +93,23 @@ 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.25"},
{Version: "3.5.1", SymlinkToVersion: "3.5.25"},
{Version: "3.5.3", SymlinkToVersion: "3.5.25"},
{Version: "3.5.4", SymlinkToVersion: "3.5.25"},
{Version: "3.5.6", SymlinkToVersion: "3.5.25"},
{Version: "3.5.7", SymlinkToVersion: "3.5.25"},
{Version: "3.5.9", SymlinkToVersion: "3.5.25"},
{Version: "3.5.13", SymlinkToVersion: "3.5.25"},
{Version: "3.5.17", SymlinkToVersion: "3.5.25"},
{Version: "3.5.21", SymlinkToVersion: "3.5.25"},
{Version: "3.5.23", SymlinkToVersion: "3.5.25"},
{Version: "3.5.24", SymlinkToVersion: "3.5.25"},
{Version: "3.5.25", Image: "registry.k8s.io/etcd:v3.5.25"},
{Version: "3.6.5", SymlinkToVersion: "3.6.6"},
{Version: "3.6.6", Image: "registry.k8s.io/etcd:v3.6.6"},
{Version: "3.5.0", SymlinkToVersion: "3.5.30"},
{Version: "3.5.1", SymlinkToVersion: "3.5.30"},
{Version: "3.5.3", SymlinkToVersion: "3.5.30"},
{Version: "3.5.4", SymlinkToVersion: "3.5.30"},
{Version: "3.5.6", SymlinkToVersion: "3.5.30"},
{Version: "3.5.7", SymlinkToVersion: "3.5.30"},
{Version: "3.5.9", SymlinkToVersion: "3.5.30"},
{Version: "3.5.13", SymlinkToVersion: "3.5.30"},
{Version: "3.5.17", SymlinkToVersion: "3.5.30"},
{Version: "3.5.21", SymlinkToVersion: "3.5.30"},
{Version: "3.5.23", SymlinkToVersion: "3.5.30"},
{Version: "3.5.24", SymlinkToVersion: "3.5.30"},
{Version: "3.5.25", SymlinkToVersion: "3.5.30"},
{Version: "3.5.30", Image: "registry.k8s.io/etcd:v3.5.30"},
{Version: "3.6.5", SymlinkToVersion: "3.6.11"},
{Version: "3.6.6", SymlinkToVersion: "3.6.11"},
{Version: "3.6.11", Image: "registry.k8s.io/etcd:v3.6.11"},
}

func etcdSupportedVersions() []etcdVersion {
Expand Down
52 changes: 28 additions & 24 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,25 +131,25 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.25
- --target-dir=/opt/etcd-v3.5.30
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.25
name: init-etcd-3-5-25
image: registry.k8s.io/etcd:v3.5.30
name: init-etcd-3-5-30
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.6
- --target-dir=/opt/etcd-v3.6.11
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.6
name: init-etcd-3-6-6
image: registry.k8s.io/etcd:v3.6.11
name: init-etcd-3-6-11
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -176,30 +176,32 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.21
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --target-dir=/opt/etcd-v3.5.25
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --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.25/etcd
- --src=/opt/etcd-v3.5.25/etcdctl
- --src=/opt/etcd-v3.5.30/etcd
- --src=/opt/etcd-v3.5.30/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.2
name: init-etcd-symlinks-3-5-25
name: init-etcd-symlinks-3-5-30
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.5
- --src=/opt/etcd-v3.6.6/etcd
- --src=/opt/etcd-v3.6.6/etcdctl
- --target-dir=/opt/etcd-v3.6.6
- --src=/opt/etcd-v3.6.11/etcd
- --src=/opt/etcd-v3.6.11/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.2
name: init-etcd-symlinks-3-6-6
name: init-etcd-symlinks-3-6-11
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down Expand Up @@ -301,25 +303,25 @@ Contents: |
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.5.25
- --target-dir=/opt/etcd-v3.5.30
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.5.25
name: init-etcd-3-5-25
image: registry.k8s.io/etcd:v3.5.30
name: init-etcd-3-5-30
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --target-dir=/opt/etcd-v3.6.6
- --target-dir=/opt/etcd-v3.6.11
- --src=/usr/local/bin/etcd
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:v3.6.6
name: init-etcd-3-6-6
image: registry.k8s.io/etcd:v3.6.11
name: init-etcd-3-6-11
resources: {}
volumeMounts:
- mountPath: /opt
Expand All @@ -346,30 +348,32 @@ Contents: |
- --target-dir=/opt/etcd-v3.5.21
- --target-dir=/opt/etcd-v3.5.23
- --target-dir=/opt/etcd-v3.5.24
- --target-dir=/opt/etcd-v3.5.25
- --target-dir=/opt/etcd-v3.5.3
- --target-dir=/opt/etcd-v3.5.4
- --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.25/etcd
- --src=/opt/etcd-v3.5.25/etcdctl
- --src=/opt/etcd-v3.5.30/etcd
- --src=/opt/etcd-v3.5.30/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.2
name: init-etcd-symlinks-3-5-25
name: init-etcd-symlinks-3-5-30
resources: {}
volumeMounts:
- mountPath: /opt
name: opt
- args:
- --symlink
- --target-dir=/opt/etcd-v3.6.5
- --src=/opt/etcd-v3.6.6/etcd
- --src=/opt/etcd-v3.6.6/etcdctl
- --target-dir=/opt/etcd-v3.6.6
- --src=/opt/etcd-v3.6.11/etcd
- --src=/opt/etcd-v3.6.11/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.34.2
name: init-etcd-symlinks-3-6-6
name: init-etcd-symlinks-3-6-11
resources: {}
volumeMounts:
- mountPath: /opt
Expand Down
84 changes: 46 additions & 38 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,35 +106,39 @@ Contents: |
- mountPath: /opt/etcd-v3.4.3
name: etcd-v3-4-13
- mountPath: /opt/etcd-v3.5.0
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.1
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.13
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.17
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.21
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.23
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.24
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.25
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.3
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.30
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.4
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.6
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.7
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.6.11
name: etcd-v3-6-11
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-6
name: etcd-v3-6-11
- mountPath: /opt/etcd-v3.6.6
name: etcd-v3-6-6
name: etcd-v3-6-11
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -164,12 +168,12 @@ Contents: |
name: etcd-v3-4-13
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.5.25
name: etcd-v3-5-25
reference: registry.k8s.io/etcd:v3.5.30
name: etcd-v3-5-30
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.6
name: etcd-v3-6-6
reference: registry.k8s.io/etcd:v3.6.11
name: etcd-v3-6-11
- hostPath:
path: /var/log/etcd-events.log
type: FileOrCreate
Expand Down Expand Up @@ -223,35 +227,39 @@ Contents: |
- mountPath: /opt/etcd-v3.4.3
name: etcd-v3-4-13
- mountPath: /opt/etcd-v3.5.0
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.1
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.13
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.17
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.21
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.23
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.24
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.25
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.3
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.30
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.4
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.6
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.7
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.5.9
name: etcd-v3-5-25
name: etcd-v3-5-30
- mountPath: /opt/etcd-v3.6.11
name: etcd-v3-6-11
- mountPath: /opt/etcd-v3.6.5
name: etcd-v3-6-6
name: etcd-v3-6-11
- mountPath: /opt/etcd-v3.6.6
name: etcd-v3-6-6
name: etcd-v3-6-11
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
Expand Down Expand Up @@ -281,12 +289,12 @@ Contents: |
name: etcd-v3-4-13
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.5.25
name: etcd-v3-5-25
reference: registry.k8s.io/etcd:v3.5.30
name: etcd-v3-5-30
- image:
pullPolicy: IfNotPresent
reference: registry.k8s.io/etcd:v3.6.6
name: etcd-v3-6-6
reference: registry.k8s.io/etcd:v3.6.11
name: etcd-v3-6-11
- hostPath:
path: /var/log/etcd.log
type: FileOrCreate
Expand Down
Loading
Loading