Sitelet https://github.com/kubernetes/kops/commit/1203f6f5cf53a693b77aa848db7dd4b48a35c3f1
Skip to content

Commit 1203f6f

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #18646 from hakman/automated-cherry-pick-of-#18645-upstream-release-1.36
Automated cherry pick of #18645: etcd-manager: compute kops-utils-cp image at use time
2 parents f190e33 + f8acfb0 commit 1203f6f

166 files changed

Lines changed: 497 additions & 496 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/model/components/etcdmanager/model.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ spec:
246246
emptyDir: {}
247247
`
248248

249-
var kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:" + kopsversion.KopsVersionImageTag()
250-
251249
// buildPod creates the pod spec, based on the EtcdClusterSpec
252250
func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {
253251
var pod *v1.Pod
@@ -290,6 +288,9 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
290288
}
291289
}
292290
} else {
291+
// Computed here rather than at process init, because kops.Version can be overridden at
292+
// runtime (e.g. from KOPS_BASE_URL).
293+
kopsUtilsImage := "registry.k8s.io/kops/kops-utils-cp:" + kopsversion.KopsVersionImageTag()
293294
utilMounts := []v1.VolumeMount{
294295
{
295296
MountPath: "/opt",

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

‎tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- --src=/ko-app/kops-utils-cp
6060
command:
6161
- /ko-app/kops-utils-cp
62-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
62+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
6363
name: kops-utils-cp
6464
resources: {}
6565
volumeMounts:
@@ -126,7 +126,7 @@ spec:
126126
- --src=/opt/etcd-v3.5.31/etcdctl
127127
command:
128128
- /opt/kops-utils/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
130130
name: init-etcd-symlinks-3-5-31
131131
resources: {}
132132
volumeMounts:
@@ -150,7 +150,7 @@ spec:
150150
- --src=/opt/etcd-v3.6.12/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
153+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
154154
name: init-etcd-symlinks-3-6-12
155155
resources: {}
156156
volumeMounts:

0 commit comments

Comments
 (0)