Skip to content

Commit eb62f2b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17536 from hakman/automated-cherry-pick-of-#17485-upstream-release-1.33
Automated cherry pick of #17485: Use official etcd images from registry.k8s.io
2 parents 4b73845 + 758fd00 commit eb62f2b

File tree

189 files changed

+388
-388
lines changed

Some content is hidden

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

189 files changed

+388
-388
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ type etcdVersion struct {
7878

7979
var etcdSupportedImages = []etcdVersion{
8080
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
81-
{Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"},
81+
{Version: "3.4.13", Image: "registry.k8s.io/etcd:v3.4.13"},
8282
{Version: "3.5.0", SymlinkToVersion: "3.5.21"},
8383
{Version: "3.5.1", SymlinkToVersion: "3.5.21"},
8484
{Version: "3.5.3", SymlinkToVersion: "3.5.21"},
@@ -88,7 +88,7 @@ var etcdSupportedImages = []etcdVersion{
8888
{Version: "3.5.9", SymlinkToVersion: "3.5.21"},
8989
{Version: "3.5.13", SymlinkToVersion: "3.5.21"},
9090
{Version: "3.5.17", SymlinkToVersion: "3.5.21"},
91-
{Version: "3.5.21", Image: "registry.k8s.io/etcd:3.5.21-0"},
91+
{Version: "3.5.21", Image: "registry.k8s.io/etcd:v3.5.21"},
9292
}
9393

9494
func etcdSupportedVersions() []etcdVersion {

‎pkg/model/components/etcdmanager/tests/interval/tasks.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Contents: |
125125
- --src=/usr/local/bin/etcdctl
126126
command:
127127
- /opt/kops-utils/kops-utils-cp
128-
image: registry.k8s.io/etcd:3.4.13-0
128+
image: registry.k8s.io/etcd:v3.4.13
129129
name: init-etcd-3-4-13
130130
resources: {}
131131
volumeMounts:
@@ -137,7 +137,7 @@ Contents: |
137137
- --src=/usr/local/bin/etcdctl
138138
command:
139139
- /opt/kops-utils/kops-utils-cp
140-
image: registry.k8s.io/etcd:3.5.21-0
140+
image: registry.k8s.io/etcd:v3.5.21
141141
name: init-etcd-3-5-21
142142
resources: {}
143143
volumeMounts:
@@ -268,7 +268,7 @@ Contents: |
268268
- --src=/usr/local/bin/etcdctl
269269
command:
270270
- /opt/kops-utils/kops-utils-cp
271-
image: registry.k8s.io/etcd:3.4.13-0
271+
image: registry.k8s.io/etcd:v3.4.13
272272
name: init-etcd-3-4-13
273273
resources: {}
274274
volumeMounts:
@@ -280,7 +280,7 @@ Contents: |
280280
- --src=/usr/local/bin/etcdctl
281281
command:
282282
- /opt/kops-utils/kops-utils-cp
283-
image: registry.k8s.io/etcd:3.5.21-0
283+
image: registry.k8s.io/etcd:v3.5.21
284284
name: init-etcd-3-5-21
285285
resources: {}
286286
volumeMounts:

‎pkg/model/components/etcdmanager/tests/minimal/tasks.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Contents: |
124124
- --src=/usr/local/bin/etcdctl
125125
command:
126126
- /opt/kops-utils/kops-utils-cp
127-
image: registry.k8s.io/etcd:3.4.13-0
127+
image: registry.k8s.io/etcd:v3.4.13
128128
name: init-etcd-3-4-13
129129
resources: {}
130130
volumeMounts:
@@ -136,7 +136,7 @@ Contents: |
136136
- --src=/usr/local/bin/etcdctl
137137
command:
138138
- /opt/kops-utils/kops-utils-cp
139-
image: registry.k8s.io/etcd:3.5.21-0
139+
image: registry.k8s.io/etcd:v3.5.21
140140
name: init-etcd-3-5-21
141141
resources: {}
142142
volumeMounts:
@@ -266,7 +266,7 @@ Contents: |
266266
- --src=/usr/local/bin/etcdctl
267267
command:
268268
- /opt/kops-utils/kops-utils-cp
269-
image: registry.k8s.io/etcd:3.4.13-0
269+
image: registry.k8s.io/etcd:v3.4.13
270270
name: init-etcd-3-4-13
271271
resources: {}
272272
volumeMounts:
@@ -278,7 +278,7 @@ Contents: |
278278
- --src=/usr/local/bin/etcdctl
279279
command:
280280
- /opt/kops-utils/kops-utils-cp
281-
image: registry.k8s.io/etcd:3.5.21-0
281+
image: registry.k8s.io/etcd:v3.5.21
282282
name: init-etcd-3-5-21
283283
resources: {}
284284
volumeMounts:

‎pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Contents: |
127127
- --src=/usr/local/bin/etcdctl
128128
command:
129129
- /opt/kops-utils/kops-utils-cp
130-
image: registry.k8s.io/etcd:3.4.13-0
130+
image: registry.k8s.io/etcd:v3.4.13
131131
name: init-etcd-3-4-13
132132
resources: {}
133133
volumeMounts:
@@ -139,7 +139,7 @@ Contents: |
139139
- --src=/usr/local/bin/etcdctl
140140
command:
141141
- /opt/kops-utils/kops-utils-cp
142-
image: registry.k8s.io/etcd:3.5.21-0
142+
image: registry.k8s.io/etcd:v3.5.21
143143
name: init-etcd-3-5-21
144144
resources: {}
145145
volumeMounts:
@@ -272,7 +272,7 @@ Contents: |
272272
- --src=/usr/local/bin/etcdctl
273273
command:
274274
- /opt/kops-utils/kops-utils-cp
275-
image: registry.k8s.io/etcd:3.4.13-0
275+
image: registry.k8s.io/etcd:v3.4.13
276276
name: init-etcd-3-4-13
277277
resources: {}
278278
volumeMounts:
@@ -284,7 +284,7 @@ Contents: |
284284
- --src=/usr/local/bin/etcdctl
285285
command:
286286
- /opt/kops-utils/kops-utils-cp
287-
image: registry.k8s.io/etcd:3.5.21-0
287+
image: registry.k8s.io/etcd:v3.5.21
288288
name: init-etcd-3-5-21
289289
resources: {}
290290
volumeMounts:

‎pkg/model/components/etcdmanager/tests/proxy/tasks.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Contents: |
133133
- --src=/usr/local/bin/etcdctl
134134
command:
135135
- /opt/kops-utils/kops-utils-cp
136-
image: registry.k8s.io/etcd:3.4.13-0
136+
image: registry.k8s.io/etcd:v3.4.13
137137
name: init-etcd-3-4-13
138138
resources: {}
139139
volumeMounts:
@@ -145,7 +145,7 @@ Contents: |
145145
- --src=/usr/local/bin/etcdctl
146146
command:
147147
- /opt/kops-utils/kops-utils-cp
148-
image: registry.k8s.io/etcd:3.5.21-0
148+
image: registry.k8s.io/etcd:v3.5.21
149149
name: init-etcd-3-5-21
150150
resources: {}
151151
volumeMounts:
@@ -284,7 +284,7 @@ Contents: |
284284
- --src=/usr/local/bin/etcdctl
285285
command:
286286
- /opt/kops-utils/kops-utils-cp
287-
image: registry.k8s.io/etcd:3.4.13-0
287+
image: registry.k8s.io/etcd:v3.4.13
288288
name: init-etcd-3-4-13
289289
resources: {}
290290
volumeMounts:
@@ -296,7 +296,7 @@ Contents: |
296296
- --src=/usr/local/bin/etcdctl
297297
command:
298298
- /opt/kops-utils/kops-utils-cp
299-
image: registry.k8s.io/etcd:3.5.21-0
299+
image: registry.k8s.io/etcd:v3.5.21
300300
name: init-etcd-3-5-21
301301
resources: {}
302302
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
- --src=/usr/local/bin/etcdctl
6262
command:
6363
- /opt/kops-utils/kops-utils-cp
64-
image: registry.k8s.io/etcd:3.4.13-0
64+
image: registry.k8s.io/etcd:v3.4.13
6565
name: init-etcd-3-4-13
6666
resources: {}
6767
volumeMounts:
@@ -73,7 +73,7 @@ spec:
7373
- --src=/usr/local/bin/etcdctl
7474
command:
7575
- /opt/kops-utils/kops-utils-cp
76-
image: registry.k8s.io/etcd:3.5.21-0
76+
image: registry.k8s.io/etcd:v3.5.21
7777
name: init-etcd-3-5-21
7878
resources: {}
7979
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
- --src=/usr/local/bin/etcdctl
6262
command:
6363
- /opt/kops-utils/kops-utils-cp
64-
image: registry.k8s.io/etcd:3.4.13-0
64+
image: registry.k8s.io/etcd:v3.4.13
6565
name: init-etcd-3-4-13
6666
resources: {}
6767
volumeMounts:
@@ -73,7 +73,7 @@ spec:
7373
- --src=/usr/local/bin/etcdctl
7474
command:
7575
- /opt/kops-utils/kops-utils-cp
76-
image: registry.k8s.io/etcd:3.5.21-0
76+
image: registry.k8s.io/etcd:v3.5.21
7777
name: init-etcd-3-5-21
7878
resources: {}
7979
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
- --src=/usr/local/bin/etcdctl
6464
command:
6565
- /opt/kops-utils/kops-utils-cp
66-
image: registry.k8s.io/etcd:3.4.13-0
66+
image: registry.k8s.io/etcd:v3.4.13
6767
name: init-etcd-3-4-13
6868
resources: {}
6969
volumeMounts:
@@ -75,7 +75,7 @@ spec:
7575
- --src=/usr/local/bin/etcdctl
7676
command:
7777
- /opt/kops-utils/kops-utils-cp
78-
image: registry.k8s.io/etcd:3.5.21-0
78+
image: registry.k8s.io/etcd:v3.5.21
7979
name: init-etcd-3-5-21
8080
resources: {}
8181
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
- --src=/usr/local/bin/etcdctl
6464
command:
6565
- /opt/kops-utils/kops-utils-cp
66-
image: registry.k8s.io/etcd:3.4.13-0
66+
image: registry.k8s.io/etcd:v3.4.13
6767
name: init-etcd-3-4-13
6868
resources: {}
6969
volumeMounts:
@@ -75,7 +75,7 @@ spec:
7575
- --src=/usr/local/bin/etcdctl
7676
command:
7777
- /opt/kops-utils/kops-utils-cp
78-
image: registry.k8s.io/etcd:3.5.21-0
78+
image: registry.k8s.io/etcd:v3.5.21
7979
name: init-etcd-3-5-21
8080
resources: {}
8181
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
- --src=/usr/local/bin/etcdctl
6161
command:
6262
- /opt/kops-utils/kops-utils-cp
63-
image: registry.k8s.io/etcd:3.4.13-0
63+
image: registry.k8s.io/etcd:v3.4.13
6464
name: init-etcd-3-4-13
6565
resources: {}
6666
volumeMounts:
@@ -72,7 +72,7 @@ spec:
7272
- --src=/usr/local/bin/etcdctl
7373
command:
7474
- /opt/kops-utils/kops-utils-cp
75-
image: registry.k8s.io/etcd:3.5.21-0
75+
image: registry.k8s.io/etcd:v3.5.21
7676
name: init-etcd-3-5-21
7777
resources: {}
7878
volumeMounts:

0 commit comments

Comments
 (0)