Skip to content

Commit e9f7ed1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17368 from hakman/automated-cherry-pick-of-#17367-upstream-release-1.32
Automated cherry pick of #17367: Update etcd to v3.5.21
2 parents e0d42cd + 495f83b commit e9f7ed1

File tree

417 files changed

+1630
-1442
lines changed

Some content is hidden

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

417 files changed

+1630
-1442
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.17"
32+
DefaultEtcd3Version_1_22 = "3.5.21"
3333
)
3434

3535
// BuildOptions is responsible for filling in the defaults for the etcd cluster model

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,16 @@ type etcdVersion struct {
7979
var etcdSupportedImages = []etcdVersion{
8080
{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
8181
{Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"},
82-
{Version: "3.5.0", SymlinkToVersion: "3.5.17"},
83-
{Version: "3.5.1", SymlinkToVersion: "3.5.17"},
84-
{Version: "3.5.3", SymlinkToVersion: "3.5.17"},
85-
{Version: "3.5.4", SymlinkToVersion: "3.5.17"},
86-
{Version: "3.5.6", SymlinkToVersion: "3.5.17"},
87-
{Version: "3.5.7", SymlinkToVersion: "3.5.17"},
88-
{Version: "3.5.9", SymlinkToVersion: "3.5.17"},
89-
{Version: "3.5.13", SymlinkToVersion: "3.5.17"},
90-
{Version: "3.5.17", Image: "registry.k8s.io/etcd:3.5.17-0"},
82+
{Version: "3.5.0", SymlinkToVersion: "3.5.21"},
83+
{Version: "3.5.1", SymlinkToVersion: "3.5.21"},
84+
{Version: "3.5.3", SymlinkToVersion: "3.5.21"},
85+
{Version: "3.5.4", SymlinkToVersion: "3.5.21"},
86+
{Version: "3.5.6", SymlinkToVersion: "3.5.21"},
87+
{Version: "3.5.7", SymlinkToVersion: "3.5.21"},
88+
{Version: "3.5.9", SymlinkToVersion: "3.5.21"},
89+
{Version: "3.5.13", SymlinkToVersion: "3.5.21"},
90+
{Version: "3.5.17", SymlinkToVersion: "3.5.21"},
91+
{Version: "3.5.21", Image: "registry.k8s.io/etcd:3.5.21-0"},
9192
}
9293

9394
func etcdSupportedVersions() []etcdVersion {

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ Contents: |
132132
- mountPath: /opt
133133
name: opt
134134
- args:
135-
- --target-dir=/opt/etcd-v3.5.17
135+
- --target-dir=/opt/etcd-v3.5.21
136136
- --src=/usr/local/bin/etcd
137137
- --src=/usr/local/bin/etcdctl
138138
command:
139139
- /opt/kops-utils/kops-utils-cp
140-
image: registry.k8s.io/etcd:3.5.17-0
141-
name: init-etcd-3-5-17
140+
image: registry.k8s.io/etcd:3.5.21-0
141+
name: init-etcd-3-5-21
142142
resources: {}
143143
volumeMounts:
144144
- mountPath: /opt
@@ -161,17 +161,18 @@ Contents: |
161161
- --target-dir=/opt/etcd-v3.5.0
162162
- --target-dir=/opt/etcd-v3.5.1
163163
- --target-dir=/opt/etcd-v3.5.13
164+
- --target-dir=/opt/etcd-v3.5.17
164165
- --target-dir=/opt/etcd-v3.5.3
165166
- --target-dir=/opt/etcd-v3.5.4
166167
- --target-dir=/opt/etcd-v3.5.6
167168
- --target-dir=/opt/etcd-v3.5.7
168169
- --target-dir=/opt/etcd-v3.5.9
169-
- --src=/opt/etcd-v3.5.17/etcd
170-
- --src=/opt/etcd-v3.5.17/etcdctl
170+
- --src=/opt/etcd-v3.5.21/etcd
171+
- --src=/opt/etcd-v3.5.21/etcdctl
171172
command:
172173
- /opt/kops-utils/kops-utils-cp
173174
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
174-
name: init-etcd-symlinks-3-5-17
175+
name: init-etcd-symlinks-3-5-21
175176
resources: {}
176177
volumeMounts:
177178
- mountPath: /opt
@@ -274,13 +275,13 @@ Contents: |
274275
- mountPath: /opt
275276
name: opt
276277
- args:
277-
- --target-dir=/opt/etcd-v3.5.17
278+
- --target-dir=/opt/etcd-v3.5.21
278279
- --src=/usr/local/bin/etcd
279280
- --src=/usr/local/bin/etcdctl
280281
command:
281282
- /opt/kops-utils/kops-utils-cp
282-
image: registry.k8s.io/etcd:3.5.17-0
283-
name: init-etcd-3-5-17
283+
image: registry.k8s.io/etcd:3.5.21-0
284+
name: init-etcd-3-5-21
284285
resources: {}
285286
volumeMounts:
286287
- mountPath: /opt
@@ -303,17 +304,18 @@ Contents: |
303304
- --target-dir=/opt/etcd-v3.5.0
304305
- --target-dir=/opt/etcd-v3.5.1
305306
- --target-dir=/opt/etcd-v3.5.13
307+
- --target-dir=/opt/etcd-v3.5.17
306308
- --target-dir=/opt/etcd-v3.5.3
307309
- --target-dir=/opt/etcd-v3.5.4
308310
- --target-dir=/opt/etcd-v3.5.6
309311
- --target-dir=/opt/etcd-v3.5.7
310312
- --target-dir=/opt/etcd-v3.5.9
311-
- --src=/opt/etcd-v3.5.17/etcd
312-
- --src=/opt/etcd-v3.5.17/etcdctl
313+
- --src=/opt/etcd-v3.5.21/etcd
314+
- --src=/opt/etcd-v3.5.21/etcdctl
313315
command:
314316
- /opt/kops-utils/kops-utils-cp
315317
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
316-
name: init-etcd-symlinks-3-5-17
318+
name: init-etcd-symlinks-3-5-21
317319
resources: {}
318320
volumeMounts:
319321
- mountPath: /opt

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

Lines changed: 14 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.17
134+
- --target-dir=/opt/etcd-v3.5.21
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:3.5.17-0
140-
name: init-etcd-3-5-17
139+
image: registry.k8s.io/etcd:3.5.21-0
140+
name: init-etcd-3-5-21
141141
resources: {}
142142
volumeMounts:
143143
- mountPath: /opt
@@ -160,17 +160,18 @@ Contents: |
160160
- --target-dir=/opt/etcd-v3.5.0
161161
- --target-dir=/opt/etcd-v3.5.1
162162
- --target-dir=/opt/etcd-v3.5.13
163+
- --target-dir=/opt/etcd-v3.5.17
163164
- --target-dir=/opt/etcd-v3.5.3
164165
- --target-dir=/opt/etcd-v3.5.4
165166
- --target-dir=/opt/etcd-v3.5.6
166167
- --target-dir=/opt/etcd-v3.5.7
167168
- --target-dir=/opt/etcd-v3.5.9
168-
- --src=/opt/etcd-v3.5.17/etcd
169-
- --src=/opt/etcd-v3.5.17/etcdctl
169+
- --src=/opt/etcd-v3.5.21/etcd
170+
- --src=/opt/etcd-v3.5.21/etcdctl
170171
command:
171172
- /opt/kops-utils/kops-utils-cp
172173
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
173-
name: init-etcd-symlinks-3-5-17
174+
name: init-etcd-symlinks-3-5-21
174175
resources: {}
175176
volumeMounts:
176177
- mountPath: /opt
@@ -272,13 +273,13 @@ Contents: |
272273
- mountPath: /opt
273274
name: opt
274275
- args:
275-
- --target-dir=/opt/etcd-v3.5.17
276+
- --target-dir=/opt/etcd-v3.5.21
276277
- --src=/usr/local/bin/etcd
277278
- --src=/usr/local/bin/etcdctl
278279
command:
279280
- /opt/kops-utils/kops-utils-cp
280-
image: registry.k8s.io/etcd:3.5.17-0
281-
name: init-etcd-3-5-17
281+
image: registry.k8s.io/etcd:3.5.21-0
282+
name: init-etcd-3-5-21
282283
resources: {}
283284
volumeMounts:
284285
- mountPath: /opt
@@ -301,17 +302,18 @@ Contents: |
301302
- --target-dir=/opt/etcd-v3.5.0
302303
- --target-dir=/opt/etcd-v3.5.1
303304
- --target-dir=/opt/etcd-v3.5.13
305+
- --target-dir=/opt/etcd-v3.5.17
304306
- --target-dir=/opt/etcd-v3.5.3
305307
- --target-dir=/opt/etcd-v3.5.4
306308
- --target-dir=/opt/etcd-v3.5.6
307309
- --target-dir=/opt/etcd-v3.5.7
308310
- --target-dir=/opt/etcd-v3.5.9
309-
- --src=/opt/etcd-v3.5.17/etcd
310-
- --src=/opt/etcd-v3.5.17/etcdctl
311+
- --src=/opt/etcd-v3.5.21/etcd
312+
- --src=/opt/etcd-v3.5.21/etcdctl
311313
command:
312314
- /opt/kops-utils/kops-utils-cp
313315
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
314-
name: init-etcd-symlinks-3-5-17
316+
name: init-etcd-symlinks-3-5-21
315317
resources: {}
316318
volumeMounts:
317319
- mountPath: /opt

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ Contents: |
134134
- mountPath: /opt
135135
name: opt
136136
- args:
137-
- --target-dir=/opt/etcd-v3.5.17
137+
- --target-dir=/opt/etcd-v3.5.21
138138
- --src=/usr/local/bin/etcd
139139
- --src=/usr/local/bin/etcdctl
140140
command:
141141
- /opt/kops-utils/kops-utils-cp
142-
image: registry.k8s.io/etcd:3.5.17-0
143-
name: init-etcd-3-5-17
142+
image: registry.k8s.io/etcd:3.5.21-0
143+
name: init-etcd-3-5-21
144144
resources: {}
145145
volumeMounts:
146146
- mountPath: /opt
@@ -163,17 +163,18 @@ Contents: |
163163
- --target-dir=/opt/etcd-v3.5.0
164164
- --target-dir=/opt/etcd-v3.5.1
165165
- --target-dir=/opt/etcd-v3.5.13
166+
- --target-dir=/opt/etcd-v3.5.17
166167
- --target-dir=/opt/etcd-v3.5.3
167168
- --target-dir=/opt/etcd-v3.5.4
168169
- --target-dir=/opt/etcd-v3.5.6
169170
- --target-dir=/opt/etcd-v3.5.7
170171
- --target-dir=/opt/etcd-v3.5.9
171-
- --src=/opt/etcd-v3.5.17/etcd
172-
- --src=/opt/etcd-v3.5.17/etcdctl
172+
- --src=/opt/etcd-v3.5.21/etcd
173+
- --src=/opt/etcd-v3.5.21/etcdctl
173174
command:
174175
- /opt/kops-utils/kops-utils-cp
175176
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
176-
name: init-etcd-symlinks-3-5-17
177+
name: init-etcd-symlinks-3-5-21
177178
resources: {}
178179
volumeMounts:
179180
- mountPath: /opt
@@ -278,13 +279,13 @@ Contents: |
278279
- mountPath: /opt
279280
name: opt
280281
- args:
281-
- --target-dir=/opt/etcd-v3.5.17
282+
- --target-dir=/opt/etcd-v3.5.21
282283
- --src=/usr/local/bin/etcd
283284
- --src=/usr/local/bin/etcdctl
284285
command:
285286
- /opt/kops-utils/kops-utils-cp
286-
image: registry.k8s.io/etcd:3.5.17-0
287-
name: init-etcd-3-5-17
287+
image: registry.k8s.io/etcd:3.5.21-0
288+
name: init-etcd-3-5-21
288289
resources: {}
289290
volumeMounts:
290291
- mountPath: /opt
@@ -307,17 +308,18 @@ Contents: |
307308
- --target-dir=/opt/etcd-v3.5.0
308309
- --target-dir=/opt/etcd-v3.5.1
309310
- --target-dir=/opt/etcd-v3.5.13
311+
- --target-dir=/opt/etcd-v3.5.17
310312
- --target-dir=/opt/etcd-v3.5.3
311313
- --target-dir=/opt/etcd-v3.5.4
312314
- --target-dir=/opt/etcd-v3.5.6
313315
- --target-dir=/opt/etcd-v3.5.7
314316
- --target-dir=/opt/etcd-v3.5.9
315-
- --src=/opt/etcd-v3.5.17/etcd
316-
- --src=/opt/etcd-v3.5.17/etcdctl
317+
- --src=/opt/etcd-v3.5.21/etcd
318+
- --src=/opt/etcd-v3.5.21/etcdctl
317319
command:
318320
- /opt/kops-utils/kops-utils-cp
319321
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
320-
name: init-etcd-symlinks-3-5-17
322+
name: init-etcd-symlinks-3-5-21
321323
resources: {}
322324
volumeMounts:
323325
- mountPath: /opt

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ Contents: |
140140
- mountPath: /opt
141141
name: opt
142142
- args:
143-
- --target-dir=/opt/etcd-v3.5.17
143+
- --target-dir=/opt/etcd-v3.5.21
144144
- --src=/usr/local/bin/etcd
145145
- --src=/usr/local/bin/etcdctl
146146
command:
147147
- /opt/kops-utils/kops-utils-cp
148-
image: registry.k8s.io/etcd:3.5.17-0
149-
name: init-etcd-3-5-17
148+
image: registry.k8s.io/etcd:3.5.21-0
149+
name: init-etcd-3-5-21
150150
resources: {}
151151
volumeMounts:
152152
- mountPath: /opt
@@ -169,17 +169,18 @@ Contents: |
169169
- --target-dir=/opt/etcd-v3.5.0
170170
- --target-dir=/opt/etcd-v3.5.1
171171
- --target-dir=/opt/etcd-v3.5.13
172+
- --target-dir=/opt/etcd-v3.5.17
172173
- --target-dir=/opt/etcd-v3.5.3
173174
- --target-dir=/opt/etcd-v3.5.4
174175
- --target-dir=/opt/etcd-v3.5.6
175176
- --target-dir=/opt/etcd-v3.5.7
176177
- --target-dir=/opt/etcd-v3.5.9
177-
- --src=/opt/etcd-v3.5.17/etcd
178-
- --src=/opt/etcd-v3.5.17/etcdctl
178+
- --src=/opt/etcd-v3.5.21/etcd
179+
- --src=/opt/etcd-v3.5.21/etcdctl
179180
command:
180181
- /opt/kops-utils/kops-utils-cp
181182
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
182-
name: init-etcd-symlinks-3-5-17
183+
name: init-etcd-symlinks-3-5-21
183184
resources: {}
184185
volumeMounts:
185186
- mountPath: /opt
@@ -290,13 +291,13 @@ Contents: |
290291
- mountPath: /opt
291292
name: opt
292293
- args:
293-
- --target-dir=/opt/etcd-v3.5.17
294+
- --target-dir=/opt/etcd-v3.5.21
294295
- --src=/usr/local/bin/etcd
295296
- --src=/usr/local/bin/etcdctl
296297
command:
297298
- /opt/kops-utils/kops-utils-cp
298-
image: registry.k8s.io/etcd:3.5.17-0
299-
name: init-etcd-3-5-17
299+
image: registry.k8s.io/etcd:3.5.21-0
300+
name: init-etcd-3-5-21
300301
resources: {}
301302
volumeMounts:
302303
- mountPath: /opt
@@ -319,17 +320,18 @@ Contents: |
319320
- --target-dir=/opt/etcd-v3.5.0
320321
- --target-dir=/opt/etcd-v3.5.1
321322
- --target-dir=/opt/etcd-v3.5.13
323+
- --target-dir=/opt/etcd-v3.5.17
322324
- --target-dir=/opt/etcd-v3.5.3
323325
- --target-dir=/opt/etcd-v3.5.4
324326
- --target-dir=/opt/etcd-v3.5.6
325327
- --target-dir=/opt/etcd-v3.5.7
326328
- --target-dir=/opt/etcd-v3.5.9
327-
- --src=/opt/etcd-v3.5.17/etcd
328-
- --src=/opt/etcd-v3.5.17/etcdctl
329+
- --src=/opt/etcd-v3.5.21/etcd
330+
- --src=/opt/etcd-v3.5.21/etcdctl
329331
command:
330332
- /opt/kops-utils/kops-utils-cp
331333
image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1
332-
name: init-etcd-symlinks-3-5-17
334+
name: init-etcd-symlinks-3-5-21
333335
resources: {}
334336
volumeMounts:
335337
- mountPath: /opt

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
backupRetentionDays: 90
4343
memoryRequest: 100Mi
4444
name: main
45-
version: 3.5.17
45+
version: 3.5.21
4646
- backups:
4747
backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
4848
cpuRequest: 100m
@@ -54,7 +54,7 @@ spec:
5454
backupRetentionDays: 90
5555
memoryRequest: 100Mi
5656
name: events
57-
version: 3.5.17
57+
version: 3.5.21
5858
externalDns:
5959
provider: dns-controller
6060
iam:

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"memberCount": 1,
3-
"etcdVersion": "3.5.17"
3+
"etcdVersion": "3.5.21"
44
}

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"memberCount": 1,
3-
"etcdVersion": "3.5.17"
3+
"etcdVersion": "3.5.21"
44
}

0 commit comments

Comments
 (0)