Skip to content

Automated cherry pick of #17485: Use official etcd images from registry.k8s.io #17536

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
Aug 2, 2025
+388 −388
Merged

Automated cherry pick of #17485: Use official etcd images from registry.k8s.io #17536

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
a1c129c
Use official etcd images from registry.k8s.io
hakman Jul 11, 2025
758fd00
hack/update-expected.sh
hakman Aug 1, 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
4 changes: 2 additions & 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 @@ -78,7 +78,7 @@ type etcdVersion struct {

var etcdSupportedImages = []etcdVersion{
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
{Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"},
{Version: "3.4.13", Image: "registry.k8s.io/etcd:v3.4.13"},
{Version: "3.5.0", SymlinkToVersion: "3.5.21"},
{Version: "3.5.1", SymlinkToVersion: "3.5.21"},
{Version: "3.5.3", SymlinkToVersion: "3.5.21"},
Expand All @@ -88,7 +88,7 @@ var etcdSupportedImages = []etcdVersion{
{Version: "3.5.9", SymlinkToVersion: "3.5.21"},
{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:3.5.21-0"},
{Version: "3.5.21", Image: "registry.k8s.io/etcd:v3.5.21"},
}

func etcdSupportedVersions() []etcdVersion {
Expand Down
8 changes: 4 additions & 4 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 @@ -125,7 +125,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -137,7 +137,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -268,7 +268,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -280,7 +280,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
8 changes: 4 additions & 4 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 @@ -124,7 +124,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -136,7 +136,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -266,7 +266,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -278,7 +278,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
8 changes: 4 additions & 4 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 @@ -127,7 +127,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -139,7 +139,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -272,7 +272,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -284,7 +284,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
8 changes: 4 additions & 4 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 @@ -133,7 +133,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -145,7 +145,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -284,7 +284,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -296,7 +296,7 @@ Contents: |
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions .../apiservernodes/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,7 +63,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -75,7 +75,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...er/apiservernodes/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,7 +63,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -75,7 +75,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...s-lb-controller/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 @@ -60,7 +60,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -72,7 +72,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...aws-lb-controller/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 @@ -60,7 +60,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -72,7 +72,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...ional_user-data/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...itional_user-data/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...expander-custom/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...y-expander-custom/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...iority-expander/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...priority-expander/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 @@ -61,7 +61,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -73,7 +73,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions ...cluster/complex/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 @@ -60,7 +60,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.4.13-0
image: registry.k8s.io/etcd:v3.4.13
name: init-etcd-3-4-13
resources: {}
volumeMounts:
Expand All @@ -72,7 +72,7 @@ spec:
- --src=/usr/local/bin/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/etcd:3.5.21-0
image: registry.k8s.io/etcd:v3.5.21
name: init-etcd-3-5-21
resources: {}
volumeMounts:
Expand Down
Loading
Loading