Skip to content

Commit aec37ef

Browse files
cardoecardoe
committed
chore(workflows): consolidate volumes definitions
Rather than defining the available volumes per template move it to the workflow level to reduce duplication. The data is still only mounted where it is needed.
1 parent 74a3210 commit aec37ef

4 files changed

Lines changed: 31 additions & 97 deletions

File tree

‎workflows/argo-events/workflowtemplates/enroll-server.yaml‎

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ kind: WorkflowTemplate
1010
spec:
1111
serviceAccountName: workflow
1212
entrypoint: main
13+
volumes:
14+
- name: bmc-master
15+
secret:
16+
secretName: bmc-master
17+
- name: baremetal-manage
18+
secret:
19+
secretName: baremetal-manage
20+
items:
21+
- key: clouds.yaml
22+
path: clouds.yaml
1323
arguments:
1424
parameters:
1525
- name: ip_address
@@ -104,16 +114,6 @@ spec:
104114
value: "{{workflow.name}}"
105115
- name: WF_UID
106116
value: "{{workflow.uid}}"
107-
volumes:
108-
- name: bmc-master
109-
secret:
110-
secretName: bmc-master
111-
- name: baremetal-manage
112-
secret:
113-
secretName: baremetal-manage
114-
items:
115-
- key: clouds.yaml
116-
path: clouds.yaml
117117
- name: openstack-wait-cmd
118118
inputs:
119119
parameters:
@@ -136,13 +136,6 @@ spec:
136136
volumeMounts:
137137
- mountPath: /etc/openstack
138138
name: baremetal-manage
139-
volumes:
140-
- name: baremetal-manage
141-
secret:
142-
secretName: baremetal-manage
143-
items:
144-
- key: clouds.yaml
145-
path: clouds.yaml
146139
- name: get-raid-config
147140
container:
148141
image: ghcr.io/rackerlabs/understack/ironic-nautobot-client:latest
@@ -165,16 +158,6 @@ spec:
165158
value: "{{workflow.name}}"
166159
- name: WF_UID
167160
value: "{{workflow.uid}}"
168-
volumes:
169-
- name: bmc-master
170-
secret:
171-
secretName: bmc-master
172-
- name: baremetal-manage
173-
secret:
174-
secretName: baremetal-manage
175-
items:
176-
- key: clouds.yaml
177-
path: clouds.yaml
178161
- name: openstack-set-baremetal-node-raid-config
179162
inputs:
180163
parameters:
@@ -214,13 +197,6 @@ spec:
214197
volumeMounts:
215198
- mountPath: /etc/openstack
216199
name: baremetal-manage
217-
volumes:
218-
- name: baremetal-manage
219-
secret:
220-
secretName: baremetal-manage
221-
items:
222-
- key: clouds.yaml
223-
path: clouds.yaml
224200
- name: openstack-state-cmd
225201
inputs:
226202
parameters:
@@ -244,10 +220,3 @@ spec:
244220
volumeMounts:
245221
- mountPath: /etc/openstack
246222
name: baremetal-manage
247-
volumes:
248-
- name: baremetal-manage
249-
secret:
250-
secretName: baremetal-manage
251-
items:
252-
- key: clouds.yaml
253-
path: clouds.yaml

‎workflows/argo-events/workflowtemplates/inspect-server.yaml‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ kind: WorkflowTemplate
1010
spec:
1111
serviceAccountName: workflow
1212
entrypoint: inspect-server
13+
volumes:
14+
- name: baremetal-manage
15+
secret:
16+
secretName: baremetal-manage
17+
items:
18+
- key: clouds.yaml
19+
path: clouds.yaml
1320
arguments:
1421
parameters:
1522
- name: node
@@ -226,13 +233,6 @@ spec:
226233
volumeMounts:
227234
- mountPath: /etc/openstack
228235
name: baremetal-manage
229-
volumes:
230-
- name: baremetal-manage
231-
secret:
232-
secretName: baremetal-manage
233-
items:
234-
- key: clouds.yaml
235-
path: clouds.yaml
236236
- name: openstack-set-cmd
237237
inputs:
238238
parameters:
@@ -257,13 +257,6 @@ spec:
257257
volumeMounts:
258258
- mountPath: /etc/openstack
259259
name: baremetal-manage
260-
volumes:
261-
- name: baremetal-manage
262-
secret:
263-
secretName: baremetal-manage
264-
items:
265-
- key: clouds.yaml
266-
path: clouds.yaml
267260
- name: openstack-read-param
268261
inputs:
269262
parameters:
@@ -289,10 +282,3 @@ spec:
289282
volumeMounts:
290283
- mountPath: /etc/openstack
291284
name: baremetal-manage
292-
volumes:
293-
- name: baremetal-manage
294-
secret:
295-
secretName: baremetal-manage
296-
items:
297-
- key: clouds.yaml
298-
path: clouds.yaml

‎workflows/argo-events/workflowtemplates/reclean-server.yaml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ metadata:
99
kind: WorkflowTemplate
1010
spec:
1111
entrypoint: main
12+
volumes:
13+
- name: baremetal-manage
14+
secret:
15+
secretName: baremetal-manage
16+
items:
17+
- key: clouds.yaml
18+
path: clouds.yaml
1219
arguments:
1320
parameters:
1421
- name: device_id
@@ -61,13 +68,6 @@ spec:
6168
- mountPath: /etc/openstack
6269
name: baremetal-manage
6370
readOnly: true
64-
volumes:
65-
- name: baremetal-manage
66-
secret:
67-
secretName: baremetal-manage
68-
items:
69-
- key: clouds.yaml
70-
path: clouds.yaml
7171
- name: openstack-state-cmd
7272
inputs:
7373
parameters:
@@ -92,10 +92,3 @@ spec:
9292
- mountPath: /etc/openstack
9393
name: baremetal-manage
9494
readOnly: true
95-
volumes:
96-
- name: baremetal-manage
97-
secret:
98-
secretName: baremetal-manage
99-
items:
100-
- key: clouds.yaml
101-
path: clouds.yaml

‎workflows/argo-events/workflowtemplates/server-firmware-update.yaml‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ kind: WorkflowTemplate
1010
spec:
1111
serviceAccountName: workflow
1212
entrypoint: server-firmware-update
13+
volumes:
14+
- name: baremetal-manage
15+
secret:
16+
secretName: baremetal-manage
17+
items:
18+
- key: clouds.yaml
19+
path: clouds.yaml
1320
arguments:
1421
parameters:
1522
- name: node
@@ -101,13 +108,6 @@ spec:
101108
volumeMounts:
102109
- mountPath: /etc/openstack
103110
name: baremetal-manage
104-
volumes:
105-
- name: baremetal-manage
106-
secret:
107-
secretName: baremetal-manage
108-
items:
109-
- key: clouds.yaml
110-
path: clouds.yaml
111111
- name: openstack-read-param
112112
inputs:
113113
parameters:
@@ -133,13 +133,6 @@ spec:
133133
volumeMounts:
134134
- mountPath: /etc/openstack
135135
name: baremetal-manage
136-
volumes:
137-
- name: baremetal-manage
138-
secret:
139-
secretName: baremetal-manage
140-
items:
141-
- key: clouds.yaml
142-
path: clouds.yaml
143136
- name: firmware-update
144137
inputs:
145138
parameters:
@@ -173,10 +166,3 @@ spec:
173166
volumeMounts:
174167
- mountPath: /etc/openstack
175168
name: baremetal-manage
176-
volumes:
177-
- name: baremetal-manage
178-
secret:
179-
secretName: baremetal-manage
180-
items:
181-
- key: clouds.yaml
182-
path: clouds.yaml

0 commit comments

Comments
 (0)