Skip to content

Commit 9f4a76f

Browse files
authored
DPTP-4267: Migrate periodic-buildxx-upgrade jobs (#76682)
1 parent 17742ec commit 9f4a76f

10 files changed

Lines changed: 124 additions & 136 deletions

File tree

ci-operator/jobs/infra-periodics.yaml

Lines changed: 110 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
periodics:
22
- agent: kubernetes
3-
cluster: build01
3+
cluster: core-ci
44
cron: 30 1 * * 1-5
55
decorate: true
66
labels:
@@ -20,6 +20,7 @@ periodics:
2020
- adm
2121
- upgrade
2222
- --to-latest
23+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build01.config
2324
command:
2425
- /usr/bin/oc
2526
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -28,9 +29,16 @@ periodics:
2829
resources:
2930
requests:
3031
cpu: 500m
31-
serviceAccountName: upgrader
32+
volumeMounts:
33+
- mountPath: /etc/build-farm-credentials
34+
name: build-farm-credentials
35+
readOnly: true
36+
volumes:
37+
- name: build-farm-credentials
38+
secret:
39+
secretName: config-updater
3240
- agent: kubernetes
33-
cluster: build02
41+
cluster: core-ci
3442
cron: 30 3 * * 1-5
3543
decorate: true
3644
labels:
@@ -50,6 +58,7 @@ periodics:
5058
- adm
5159
- upgrade
5260
- --to-latest
61+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build03.config
5362
command:
5463
- /usr/bin/oc
5564
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -58,9 +67,16 @@ periodics:
5867
resources:
5968
requests:
6069
cpu: 500m
61-
serviceAccountName: upgrader
70+
volumeMounts:
71+
- mountPath: /etc/build-farm-credentials
72+
name: build-farm-credentials
73+
readOnly: true
74+
volumes:
75+
- name: build-farm-credentials
76+
secret:
77+
secretName: config-updater
6278
- agent: kubernetes
63-
cluster: build04
79+
cluster: core-ci
6480
cron: 30 4 * * 1-5
6581
decorate: true
6682
labels:
@@ -80,6 +96,7 @@ periodics:
8096
- adm
8197
- upgrade
8298
- --to-latest
99+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build04.config
83100
command:
84101
- /usr/bin/oc
85102
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -88,9 +105,16 @@ periodics:
88105
resources:
89106
requests:
90107
cpu: 500m
91-
serviceAccountName: upgrader
108+
volumeMounts:
109+
- mountPath: /etc/build-farm-credentials
110+
name: build-farm-credentials
111+
readOnly: true
112+
volumes:
113+
- name: build-farm-credentials
114+
secret:
115+
secretName: config-updater
92116
- agent: kubernetes
93-
cluster: build05
117+
cluster: core-ci
94118
cron: 30 5 * * 1-5
95119
decorate: true
96120
labels:
@@ -110,6 +134,7 @@ periodics:
110134
- adm
111135
- upgrade
112136
- --to-latest
137+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build05.config
113138
command:
114139
- /usr/bin/oc
115140
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -118,9 +143,16 @@ periodics:
118143
resources:
119144
requests:
120145
cpu: 500m
121-
serviceAccountName: upgrader
146+
volumeMounts:
147+
- mountPath: /etc/build-farm-credentials
148+
name: build-farm-credentials
149+
readOnly: true
150+
volumes:
151+
- name: build-farm-credentials
152+
secret:
153+
secretName: config-updater
122154
- agent: kubernetes
123-
cluster: build06
155+
cluster: core-ci
124156
cron: 30 6 * * 1-5
125157
decorate: true
126158
labels:
@@ -140,6 +172,7 @@ periodics:
140172
- adm
141173
- upgrade
142174
- --to-latest
175+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build06.config
143176
command:
144177
- /usr/bin/oc
145178
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -148,9 +181,16 @@ periodics:
148181
resources:
149182
requests:
150183
cpu: 500m
151-
serviceAccountName: upgrader
184+
volumeMounts:
185+
- mountPath: /etc/build-farm-credentials
186+
name: build-farm-credentials
187+
readOnly: true
188+
volumes:
189+
- name: build-farm-credentials
190+
secret:
191+
secretName: config-updater
152192
- agent: kubernetes
153-
cluster: build07
193+
cluster: core-ci
154194
cron: 30 7 * * 1-5
155195
decorate: true
156196
labels:
@@ -170,6 +210,7 @@ periodics:
170210
- adm
171211
- upgrade
172212
- --to-latest
213+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build07.config
173214
command:
174215
- /usr/bin/oc
175216
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -178,9 +219,16 @@ periodics:
178219
resources:
179220
requests:
180221
cpu: 500m
181-
serviceAccountName: upgrader
222+
volumeMounts:
223+
- mountPath: /etc/build-farm-credentials
224+
name: build-farm-credentials
225+
readOnly: true
226+
volumes:
227+
- name: build-farm-credentials
228+
secret:
229+
secretName: config-updater
182230
- agent: kubernetes
183-
cluster: build08
231+
cluster: core-ci
184232
cron: 30 8 * * 1-5
185233
decorate: true
186234
labels:
@@ -200,6 +248,7 @@ periodics:
200248
- adm
201249
- upgrade
202250
- --to-latest
251+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build08.config
203252
command:
204253
- /usr/bin/oc
205254
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -208,9 +257,16 @@ periodics:
208257
resources:
209258
requests:
210259
cpu: 500m
211-
serviceAccountName: upgrader
260+
volumeMounts:
261+
- mountPath: /etc/build-farm-credentials
262+
name: build-farm-credentials
263+
readOnly: true
264+
volumes:
265+
- name: build-farm-credentials
266+
secret:
267+
secretName: config-updater
212268
- agent: kubernetes
213-
cluster: build09
269+
cluster: core-ci
214270
cron: 30 9 * * 1-5
215271
decorate: true
216272
labels:
@@ -230,6 +286,7 @@ periodics:
230286
- adm
231287
- upgrade
232288
- --to-latest
289+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build09.config
233290
command:
234291
- /usr/bin/oc
235292
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -238,9 +295,16 @@ periodics:
238295
resources:
239296
requests:
240297
cpu: 500m
241-
serviceAccountName: upgrader
298+
volumeMounts:
299+
- mountPath: /etc/build-farm-credentials
300+
name: build-farm-credentials
301+
readOnly: true
302+
volumes:
303+
- name: build-farm-credentials
304+
secret:
305+
secretName: config-updater
242306
- agent: kubernetes
243-
cluster: build10
307+
cluster: core-ci
244308
cron: 30 10 * * 1-5
245309
decorate: true
246310
labels:
@@ -260,6 +324,7 @@ periodics:
260324
- adm
261325
- upgrade
262326
- --to-latest
327+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build10.config
263328
command:
264329
- /usr/bin/oc
265330
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -268,9 +333,16 @@ periodics:
268333
resources:
269334
requests:
270335
cpu: 500m
271-
serviceAccountName: upgrader
336+
volumeMounts:
337+
- mountPath: /etc/build-farm-credentials
338+
name: build-farm-credentials
339+
readOnly: true
340+
volumes:
341+
- name: build-farm-credentials
342+
secret:
343+
secretName: config-updater
272344
- agent: kubernetes
273-
cluster: build11
345+
cluster: core-ci
274346
cron: 30 11 * * 1-5
275347
decorate: true
276348
labels:
@@ -290,6 +362,7 @@ periodics:
290362
- adm
291363
- upgrade
292364
- --to-latest
365+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.build11.config
293366
command:
294367
- /usr/bin/oc
295368
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -298,9 +371,16 @@ periodics:
298371
resources:
299372
requests:
300373
cpu: 500m
301-
serviceAccountName: upgrader
374+
volumeMounts:
375+
- mountPath: /etc/build-farm-credentials
376+
name: build-farm-credentials
377+
readOnly: true
378+
volumes:
379+
- name: build-farm-credentials
380+
secret:
381+
secretName: config-updater
302382
- agent: kubernetes
303-
cluster: hosted-mgmt
383+
cluster: core-ci
304384
cron: 30 0 * * 1-5
305385
decorate: true
306386
labels:
@@ -320,6 +400,7 @@ periodics:
320400
- adm
321401
- upgrade
322402
- --to-latest
403+
- --kubeconfig=/etc/build-farm-credentials/sa.config-updater.hosted-mgmt.config
323404
command:
324405
- /usr/bin/oc
325406
image: quay-proxy.ci.openshift.org/openshift/ci:ocp_4.17_cli
@@ -328,7 +409,14 @@ periodics:
328409
resources:
329410
requests:
330411
cpu: 500m
331-
serviceAccountName: upgrader
412+
volumeMounts:
413+
- mountPath: /etc/build-farm-credentials
414+
name: build-farm-credentials
415+
readOnly: true
416+
volumes:
417+
- name: build-farm-credentials
418+
secret:
419+
secretName: config-updater
332420
- agent: kubernetes
333421
cluster: app.ci
334422
cron: 0 5 * * 1-5

clusters/_cluster-install/build01.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ onboard:
1616
passthrough:
1717
exclude:
1818
- "**/supplemental-ci-images/**"
19-
- "**/upgrader-sa.yaml"
2019
openshiftMonitoring:
2120
patches:
2221
- matches:

clusters/_cluster-install/build02.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ onboard:
4949
passthrough:
5050
exclude:
5151
- "**/supplemental-ci-images/**"
52-
- "**/upgrader-sa.yaml"
5352
openshiftMonitoring:
5453
patches:
5554
- matches:

clusters/build-clusters/build01/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,18 @@ Upgrading inside the same minor version of `build01` is automated by [periodic-b
186186

187187
### Upgrading between minor versions
188188

189-
Modify channel configuration, e.g., from OCP 4.3 to 4.4:
189+
Modify channel configuration, e.g., from OCP 4.19 to 4.20:
190190

191191
```
192-
oc --as system:admin --context build01 patch clusterversion version --type json -p '[{"op": "add", "path": "/spec/channel", "value": "candidate-4.4"}]'
192+
oc --as system:admin --context build01 adm upgrade channel candidate-4.20
193193
```
194194

195195
### Run the upgrade command
196196

197-
For example, upgrade to 4.5.4
197+
For example, upgrade to 4.20.16
198198

199199
```
200-
oc --as system:admin --context build01 adm upgrade --to=4.5.4
200+
oc --as system:admin --context build01 adm upgrade --to=4.20.16
201201
```
202202

203203
## Destroy the cluster

clusters/build-clusters/common_except_app.ci/upgrader/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

clusters/build-clusters/common_except_app.ci/upgrader/upgrader-sa.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)