Skip to content

Commit f04e817

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17720 from hakman/etcd-3.5.24
Update etcd to v3.5.24 for K8s <1.34
2 parents 119575b + 32f7c15 commit f04e817

File tree

395 files changed

+1534
-1534
lines changed

Some content is hidden

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

395 files changed

+1534
-1534
lines changed

‎pkg/model/components/etcd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct {
2929
var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}
3030

3131
const (
32-
DefaultEtcd3Version_1_22 = "3.5.23"
32+
DefaultEtcd3Version_1_22 = "3.5.24"
3333
DefaultEtcd3Version_1_34 = "3.6.5"
3434
)
3535

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ type etcdVersion struct {
9393
var etcdSupportedImages = []etcdVersion{
9494
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
9595
{Version: "3.4.13", Image: "registry.k8s.io/etcd:v3.4.13"},
96-
{Version: "3.5.0", SymlinkToVersion: "3.5.23"},
97-
{Version: "3.5.1", SymlinkToVersion: "3.5.23"},
98-
{Version: "3.5.3", SymlinkToVersion: "3.5.23"},
99-
{Version: "3.5.4", SymlinkToVersion: "3.5.23"},
100-
{Version: "3.5.6", SymlinkToVersion: "3.5.23"},
101-
{Version: "3.5.7", SymlinkToVersion: "3.5.23"},
102-
{Version: "3.5.9", SymlinkToVersion: "3.5.23"},
103-
{Version: "3.5.13", SymlinkToVersion: "3.5.23"},
104-
{Version: "3.5.17", SymlinkToVersion: "3.5.23"},
105-
{Version: "3.5.21", SymlinkToVersion: "3.5.23"},
106-
{Version: "3.5.23", Image: "registry.k8s.io/etcd:v3.5.23"},
96+
{Version: "3.5.0", SymlinkToVersion: "3.5.24"},
97+
{Version: "3.5.1", SymlinkToVersion: "3.5.24"},
98+
{Version: "3.5.3", SymlinkToVersion: "3.5.24"},
99+
{Version: "3.5.4", SymlinkToVersion: "3.5.24"},
100+
{Version: "3.5.6", SymlinkToVersion: "3.5.24"},
101+
{Version: "3.5.7", SymlinkToVersion: "3.5.24"},
102+
{Version: "3.5.9", SymlinkToVersion: "3.5.24"},
103+
{Version: "3.5.13", SymlinkToVersion: "3.5.24"},
104+
{Version: "3.5.17", SymlinkToVersion: "3.5.24"},
105+
{Version: "3.5.21", SymlinkToVersion: "3.5.24"},
106+
{Version: "3.5.24", Image: "registry.k8s.io/etcd:v3.5.24"},
107107
{Version: "3.6.5", Image: "registry.k8s.io/etcd:v3.6.5"},
108108
}
109109

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ Contents: |
131131
- mountPath: /opt
132132
name: opt
133133
- args:
134-
- --target-dir=/opt/etcd-v3.5.23
134+
- --target-dir=/opt/etcd-v3.5.24
135135
- --src=/usr/local/bin/etcd
136136
- --src=/usr/local/bin/etcdctl
137137
command:
138138
- /opt/kops-utils/kops-utils-cp
139-
image: registry.k8s.io/etcd:v3.5.23
140-
name: init-etcd-3-5-23
139+
image: registry.k8s.io/etcd:v3.5.24
140+
name: init-etcd-3-5-24
141141
resources: {}
142142
volumeMounts:
143143
- mountPath: /opt
@@ -179,12 +179,12 @@ Contents: |
179179
- --target-dir=/opt/etcd-v3.5.6
180180
- --target-dir=/opt/etcd-v3.5.7
181181
- --target-dir=/opt/etcd-v3.5.9
182-
- --src=/opt/etcd-v3.5.23/etcd
183-
- --src=/opt/etcd-v3.5.23/etcdctl
182+
- --src=/opt/etcd-v3.5.24/etcd
183+
- --src=/opt/etcd-v3.5.24/etcdctl
184184
command:
185185
- /opt/kops-utils/kops-utils-cp
186186
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
187-
name: init-etcd-symlinks-3-5-23
187+
name: init-etcd-symlinks-3-5-24
188188
resources: {}
189189
volumeMounts:
190190
- mountPath: /opt
@@ -286,13 +286,13 @@ Contents: |
286286
- mountPath: /opt
287287
name: opt
288288
- args:
289-
- --target-dir=/opt/etcd-v3.5.23
289+
- --target-dir=/opt/etcd-v3.5.24
290290
- --src=/usr/local/bin/etcd
291291
- --src=/usr/local/bin/etcdctl
292292
command:
293293
- /opt/kops-utils/kops-utils-cp
294-
image: registry.k8s.io/etcd:v3.5.23
295-
name: init-etcd-3-5-23
294+
image: registry.k8s.io/etcd:v3.5.24
295+
name: init-etcd-3-5-24
296296
resources: {}
297297
volumeMounts:
298298
- mountPath: /opt
@@ -334,12 +334,12 @@ Contents: |
334334
- --target-dir=/opt/etcd-v3.5.6
335335
- --target-dir=/opt/etcd-v3.5.7
336336
- --target-dir=/opt/etcd-v3.5.9
337-
- --src=/opt/etcd-v3.5.23/etcd
338-
- --src=/opt/etcd-v3.5.23/etcdctl
337+
- --src=/opt/etcd-v3.5.24/etcd
338+
- --src=/opt/etcd-v3.5.24/etcdctl
339339
command:
340340
- /opt/kops-utils/kops-utils-cp
341341
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
342-
name: init-etcd-symlinks-3-5-23
342+
name: init-etcd-symlinks-3-5-24
343343
resources: {}
344344
volumeMounts:
345345
- mountPath: /opt

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,27 @@ Contents: |
106106
- mountPath: /opt/etcd-v3.4.3
107107
name: etcd-v3-4-13
108108
- mountPath: /opt/etcd-v3.5.0
109-
name: etcd-v3-5-23
109+
name: etcd-v3-5-24
110110
- mountPath: /opt/etcd-v3.5.1
111-
name: etcd-v3-5-23
111+
name: etcd-v3-5-24
112112
- mountPath: /opt/etcd-v3.5.13
113-
name: etcd-v3-5-23
113+
name: etcd-v3-5-24
114114
- mountPath: /opt/etcd-v3.5.17
115-
name: etcd-v3-5-23
115+
name: etcd-v3-5-24
116116
- mountPath: /opt/etcd-v3.5.21
117-
name: etcd-v3-5-23
118-
- mountPath: /opt/etcd-v3.5.23
119-
name: etcd-v3-5-23
117+
name: etcd-v3-5-24
118+
- mountPath: /opt/etcd-v3.5.24
119+
name: etcd-v3-5-24
120120
- mountPath: /opt/etcd-v3.5.3
121-
name: etcd-v3-5-23
121+
name: etcd-v3-5-24
122122
- mountPath: /opt/etcd-v3.5.4
123-
name: etcd-v3-5-23
123+
name: etcd-v3-5-24
124124
- mountPath: /opt/etcd-v3.5.6
125-
name: etcd-v3-5-23
125+
name: etcd-v3-5-24
126126
- mountPath: /opt/etcd-v3.5.7
127-
name: etcd-v3-5-23
127+
name: etcd-v3-5-24
128128
- mountPath: /opt/etcd-v3.5.9
129-
name: etcd-v3-5-23
129+
name: etcd-v3-5-24
130130
- mountPath: /opt/etcd-v3.6.5
131131
name: etcd-v3-6-5
132132
- mountPath: /var/log/etcd.log
@@ -158,8 +158,8 @@ Contents: |
158158
name: etcd-v3-4-13
159159
- image:
160160
pullPolicy: IfNotPresent
161-
reference: registry.k8s.io/etcd:v3.5.23
162-
name: etcd-v3-5-23
161+
reference: registry.k8s.io/etcd:v3.5.24
162+
name: etcd-v3-5-24
163163
- image:
164164
pullPolicy: IfNotPresent
165165
reference: registry.k8s.io/etcd:v3.6.5
@@ -217,27 +217,27 @@ Contents: |
217217
- mountPath: /opt/etcd-v3.4.3
218218
name: etcd-v3-4-13
219219
- mountPath: /opt/etcd-v3.5.0
220-
name: etcd-v3-5-23
220+
name: etcd-v3-5-24
221221
- mountPath: /opt/etcd-v3.5.1
222-
name: etcd-v3-5-23
222+
name: etcd-v3-5-24
223223
- mountPath: /opt/etcd-v3.5.13
224-
name: etcd-v3-5-23
224+
name: etcd-v3-5-24
225225
- mountPath: /opt/etcd-v3.5.17
226-
name: etcd-v3-5-23
226+
name: etcd-v3-5-24
227227
- mountPath: /opt/etcd-v3.5.21
228-
name: etcd-v3-5-23
229-
- mountPath: /opt/etcd-v3.5.23
230-
name: etcd-v3-5-23
228+
name: etcd-v3-5-24
229+
- mountPath: /opt/etcd-v3.5.24
230+
name: etcd-v3-5-24
231231
- mountPath: /opt/etcd-v3.5.3
232-
name: etcd-v3-5-23
232+
name: etcd-v3-5-24
233233
- mountPath: /opt/etcd-v3.5.4
234-
name: etcd-v3-5-23
234+
name: etcd-v3-5-24
235235
- mountPath: /opt/etcd-v3.5.6
236-
name: etcd-v3-5-23
236+
name: etcd-v3-5-24
237237
- mountPath: /opt/etcd-v3.5.7
238-
name: etcd-v3-5-23
238+
name: etcd-v3-5-24
239239
- mountPath: /opt/etcd-v3.5.9
240-
name: etcd-v3-5-23
240+
name: etcd-v3-5-24
241241
- mountPath: /opt/etcd-v3.6.5
242242
name: etcd-v3-6-5
243243
- mountPath: /var/log/etcd.log
@@ -269,8 +269,8 @@ Contents: |
269269
name: etcd-v3-4-13
270270
- image:
271271
pullPolicy: IfNotPresent
272-
reference: registry.k8s.io/etcd:v3.5.23
273-
name: etcd-v3-5-23
272+
reference: registry.k8s.io/etcd:v3.5.24
273+
name: etcd-v3-5-24
274274
- image:
275275
pullPolicy: IfNotPresent
276276
reference: registry.k8s.io/etcd:v3.6.5

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ Contents: |
133133
- mountPath: /opt
134134
name: opt
135135
- args:
136-
- --target-dir=/opt/etcd-v3.5.23
136+
- --target-dir=/opt/etcd-v3.5.24
137137
- --src=/usr/local/bin/etcd
138138
- --src=/usr/local/bin/etcdctl
139139
command:
140140
- /opt/kops-utils/kops-utils-cp
141-
image: registry.k8s.io/etcd:v3.5.23
142-
name: init-etcd-3-5-23
141+
image: registry.k8s.io/etcd:v3.5.24
142+
name: init-etcd-3-5-24
143143
resources: {}
144144
volumeMounts:
145145
- mountPath: /opt
@@ -181,12 +181,12 @@ Contents: |
181181
- --target-dir=/opt/etcd-v3.5.6
182182
- --target-dir=/opt/etcd-v3.5.7
183183
- --target-dir=/opt/etcd-v3.5.9
184-
- --src=/opt/etcd-v3.5.23/etcd
185-
- --src=/opt/etcd-v3.5.23/etcdctl
184+
- --src=/opt/etcd-v3.5.24/etcd
185+
- --src=/opt/etcd-v3.5.24/etcdctl
186186
command:
187187
- /opt/kops-utils/kops-utils-cp
188188
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
189-
name: init-etcd-symlinks-3-5-23
189+
name: init-etcd-symlinks-3-5-24
190190
resources: {}
191191
volumeMounts:
192192
- mountPath: /opt
@@ -290,13 +290,13 @@ Contents: |
290290
- mountPath: /opt
291291
name: opt
292292
- args:
293-
- --target-dir=/opt/etcd-v3.5.23
293+
- --target-dir=/opt/etcd-v3.5.24
294294
- --src=/usr/local/bin/etcd
295295
- --src=/usr/local/bin/etcdctl
296296
command:
297297
- /opt/kops-utils/kops-utils-cp
298-
image: registry.k8s.io/etcd:v3.5.23
299-
name: init-etcd-3-5-23
298+
image: registry.k8s.io/etcd:v3.5.24
299+
name: init-etcd-3-5-24
300300
resources: {}
301301
volumeMounts:
302302
- mountPath: /opt
@@ -338,12 +338,12 @@ Contents: |
338338
- --target-dir=/opt/etcd-v3.5.6
339339
- --target-dir=/opt/etcd-v3.5.7
340340
- --target-dir=/opt/etcd-v3.5.9
341-
- --src=/opt/etcd-v3.5.23/etcd
342-
- --src=/opt/etcd-v3.5.23/etcdctl
341+
- --src=/opt/etcd-v3.5.24/etcd
342+
- --src=/opt/etcd-v3.5.24/etcdctl
343343
command:
344344
- /opt/kops-utils/kops-utils-cp
345345
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
346-
name: init-etcd-symlinks-3-5-23
346+
name: init-etcd-symlinks-3-5-24
347347
resources: {}
348348
volumeMounts:
349349
- mountPath: /opt

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ Contents: |
139139
- mountPath: /opt
140140
name: opt
141141
- args:
142-
- --target-dir=/opt/etcd-v3.5.23
142+
- --target-dir=/opt/etcd-v3.5.24
143143
- --src=/usr/local/bin/etcd
144144
- --src=/usr/local/bin/etcdctl
145145
command:
146146
- /opt/kops-utils/kops-utils-cp
147-
image: registry.k8s.io/etcd:v3.5.23
148-
name: init-etcd-3-5-23
147+
image: registry.k8s.io/etcd:v3.5.24
148+
name: init-etcd-3-5-24
149149
resources: {}
150150
volumeMounts:
151151
- mountPath: /opt
@@ -187,12 +187,12 @@ Contents: |
187187
- --target-dir=/opt/etcd-v3.5.6
188188
- --target-dir=/opt/etcd-v3.5.7
189189
- --target-dir=/opt/etcd-v3.5.9
190-
- --src=/opt/etcd-v3.5.23/etcd
191-
- --src=/opt/etcd-v3.5.23/etcdctl
190+
- --src=/opt/etcd-v3.5.24/etcd
191+
- --src=/opt/etcd-v3.5.24/etcdctl
192192
command:
193193
- /opt/kops-utils/kops-utils-cp
194194
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
195-
name: init-etcd-symlinks-3-5-23
195+
name: init-etcd-symlinks-3-5-24
196196
resources: {}
197197
volumeMounts:
198198
- mountPath: /opt
@@ -302,13 +302,13 @@ Contents: |
302302
- mountPath: /opt
303303
name: opt
304304
- args:
305-
- --target-dir=/opt/etcd-v3.5.23
305+
- --target-dir=/opt/etcd-v3.5.24
306306
- --src=/usr/local/bin/etcd
307307
- --src=/usr/local/bin/etcdctl
308308
command:
309309
- /opt/kops-utils/kops-utils-cp
310-
image: registry.k8s.io/etcd:v3.5.23
311-
name: init-etcd-3-5-23
310+
image: registry.k8s.io/etcd:v3.5.24
311+
name: init-etcd-3-5-24
312312
resources: {}
313313
volumeMounts:
314314
- mountPath: /opt
@@ -350,12 +350,12 @@ Contents: |
350350
- --target-dir=/opt/etcd-v3.5.6
351351
- --target-dir=/opt/etcd-v3.5.7
352352
- --target-dir=/opt/etcd-v3.5.9
353-
- --src=/opt/etcd-v3.5.23/etcd
354-
- --src=/opt/etcd-v3.5.23/etcdctl
353+
- --src=/opt/etcd-v3.5.24/etcd
354+
- --src=/opt/etcd-v3.5.24/etcdctl
355355
command:
356356
- /opt/kops-utils/kops-utils-cp
357357
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
358-
name: init-etcd-symlinks-3-5-23
358+
name: init-etcd-symlinks-3-5-24
359359
resources: {}
360360
volumeMounts:
361361
- mountPath: /opt

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,27 @@ spec:
4343
- mountPath: /opt/etcd-v3.4.3
4444
name: etcd-v3-4-13
4545
- mountPath: /opt/etcd-v3.5.0
46-
name: etcd-v3-5-23
46+
name: etcd-v3-5-24
4747
- mountPath: /opt/etcd-v3.5.1
48-
name: etcd-v3-5-23
48+
name: etcd-v3-5-24
4949
- mountPath: /opt/etcd-v3.5.13
50-
name: etcd-v3-5-23
50+
name: etcd-v3-5-24
5151
- mountPath: /opt/etcd-v3.5.17
52-
name: etcd-v3-5-23
52+
name: etcd-v3-5-24
5353
- mountPath: /opt/etcd-v3.5.21
54-
name: etcd-v3-5-23
55-
- mountPath: /opt/etcd-v3.5.23
56-
name: etcd-v3-5-23
54+
name: etcd-v3-5-24
55+
- mountPath: /opt/etcd-v3.5.24
56+
name: etcd-v3-5-24
5757
- mountPath: /opt/etcd-v3.5.3
58-
name: etcd-v3-5-23
58+
name: etcd-v3-5-24
5959
- mountPath: /opt/etcd-v3.5.4
60-
name: etcd-v3-5-23
60+
name: etcd-v3-5-24
6161
- mountPath: /opt/etcd-v3.5.6
62-
name: etcd-v3-5-23
62+
name: etcd-v3-5-24
6363
- mountPath: /opt/etcd-v3.5.7
64-
name: etcd-v3-5-23
64+
name: etcd-v3-5-24
6565
- mountPath: /opt/etcd-v3.5.9
66-
name: etcd-v3-5-23
66+
name: etcd-v3-5-24
6767
- mountPath: /opt/etcd-v3.6.5
6868
name: etcd-v3-6-5
6969
- mountPath: /var/log/etcd.log
@@ -95,8 +95,8 @@ spec:
9595
name: etcd-v3-4-13
9696
- image:
9797
pullPolicy: IfNotPresent
98-
reference: registry.k8s.io/etcd:v3.5.23
99-
name: etcd-v3-5-23
98+
reference: registry.k8s.io/etcd:v3.5.24
99+
name: etcd-v3-5-24
100100
- image:
101101
pullPolicy: IfNotPresent
102102
reference: registry.k8s.io/etcd:v3.6.5

0 commit comments

Comments
 (0)