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

etcd-manager: compute kops-utils-cp image at use time #18645

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
kubernetes-prow merged 1 commit into from
Jul 30, 2026
Merged

etcd-manager: compute kops-utils-cp image at use time #18645

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/model/components/etcdmanager/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ spec:
emptyDir: {}
`

var kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:" + kopsversion.KopsVersionImageTag()

// buildPod creates the pod spec, based on the EtcdClusterSpec
func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {
var pod *v1.Pod
Expand Down Expand Up @@ -298,6 +296,9 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
}
}
} else {
// Computed here rather than at process init, because kops.Version can be overridden at
// runtime (e.g. from KOPS_BASE_URL).
kopsUtilsImage := "registry.k8s.io/kops/kops-utils-cp:" + kopsversion.KopsVersionImageTag()
utilMounts := []v1.VolumeMount{
{
MountPath: "/opt",
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions ...e_cluster/complex/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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions ...luster/compress/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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions ..._cluster/compress/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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions ...ntainerd-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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions ...containerd-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 @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -162,7 +162,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.37.0-alpha.1
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Loading
Loading