Skip to content

Commit 07f79ad

Browse files
Bobbins228openshift-merge-bot[bot]
Bobbins228
authored and
openshift-merge-bot[bot]
committed
Specificed mount paths and fixed unit tests
1 parent 9dd120b commit 07f79ad

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎src/codeflare_sdk/templates/base-template.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ spec:
157157
- name: server-cert
158158
mountPath: "/home/ray/workspace/tls"
159159
readOnly: true
160-
- mountPath: /etc/pki/tls/certs
160+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
161161
name: odh-trusted-ca-cert
162162
subPath: odh-trusted-ca-bundle.crt
163-
- mountPath: /etc/ssl/certs
163+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
164164
name: odh-trusted-ca-cert
165165
subPath: odh-trusted-ca-bundle.crt
166-
- mountPath: /etc/pki/tls/certs
166+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
167167
name: odh-ca-cert
168168
subPath: odh-ca-bundle.crt
169-
- mountPath: /etc/ssl/certs
169+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
170170
name: odh-ca-cert
171171
subPath: odh-ca-bundle.crt
172172
initContainers:
@@ -303,16 +303,16 @@ spec:
303303
- name: server-cert
304304
mountPath: "/home/ray/workspace/tls"
305305
readOnly: true
306-
- mountPath: /etc/pki/tls/certs
306+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
307307
name: odh-trusted-ca-cert
308308
subPath: odh-trusted-ca-bundle.crt
309-
- mountPath: /etc/ssl/certs
309+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
310310
name: odh-trusted-ca-cert
311311
subPath: odh-trusted-ca-bundle.crt
312-
- mountPath: /etc/pki/tls/certs
312+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
313313
name: odh-ca-cert
314314
subPath: odh-ca-bundle.crt
315-
- mountPath: /etc/ssl/certs
315+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
316316
name: odh-ca-cert
317317
subPath: odh-ca-bundle.crt
318318
volumes:

‎tests/test-case-no-mcad.yamls

+8-8
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@ spec:
8181
- mountPath: /home/ray/workspace/tls
8282
name: server-cert
8383
readOnly: true
84-
- mountPath: /etc/pki/tls/certs
84+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
8585
name: odh-trusted-ca-cert
8686
subPath: odh-trusted-ca-bundle.crt
87-
- mountPath: /etc/ssl/certs
87+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
8888
name: odh-trusted-ca-cert
8989
subPath: odh-trusted-ca-bundle.crt
90-
- mountPath: /etc/pki/tls/certs
90+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
9191
name: odh-ca-cert
9292
subPath: odh-ca-bundle.crt
93-
- mountPath: /etc/ssl/certs
93+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
9494
name: odh-ca-cert
9595
subPath: odh-ca-bundle.crt
9696
imagePullSecrets:
@@ -173,16 +173,16 @@ spec:
173173
- mountPath: /home/ray/workspace/tls
174174
name: server-cert
175175
readOnly: true
176-
- mountPath: /etc/pki/tls/certs
176+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
177177
name: odh-trusted-ca-cert
178178
subPath: odh-trusted-ca-bundle.crt
179-
- mountPath: /etc/ssl/certs
179+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
180180
name: odh-trusted-ca-cert
181181
subPath: odh-trusted-ca-bundle.crt
182-
- mountPath: /etc/pki/tls/certs
182+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
183183
name: odh-ca-cert
184184
subPath: odh-ca-bundle.crt
185-
- mountPath: /etc/ssl/certs
185+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
186186
name: odh-ca-cert
187187
subPath: odh-ca-bundle.crt
188188
imagePullSecrets:

‎tests/test-case-prio.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ spec:
111111
- mountPath: /home/ray/workspace/tls
112112
name: server-cert
113113
readOnly: true
114-
- mountPath: /etc/pki/tls/certs
114+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
115115
name: odh-trusted-ca-cert
116116
subPath: odh-trusted-ca-bundle.crt
117-
- mountPath: /etc/ssl/certs
117+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
118118
name: odh-trusted-ca-cert
119119
subPath: odh-trusted-ca-bundle.crt
120-
- mountPath: /etc/pki/tls/certs
120+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
121121
name: odh-ca-cert
122122
subPath: odh-ca-bundle.crt
123-
- mountPath: /etc/ssl/certs
123+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
124124
name: odh-ca-cert
125125
subPath: odh-ca-bundle.crt
126126
imagePullSecrets:
@@ -204,16 +204,16 @@ spec:
204204
- mountPath: /home/ray/workspace/tls
205205
name: server-cert
206206
readOnly: true
207-
- mountPath: /etc/pki/tls/certs
207+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
208208
name: odh-trusted-ca-cert
209209
subPath: odh-trusted-ca-bundle.crt
210-
- mountPath: /etc/ssl/certs
210+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
211211
name: odh-trusted-ca-cert
212212
subPath: odh-trusted-ca-bundle.crt
213-
- mountPath: /etc/pki/tls/certs
213+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
214214
name: odh-ca-cert
215215
subPath: odh-ca-bundle.crt
216-
- mountPath: /etc/ssl/certs
216+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
217217
name: odh-ca-cert
218218
subPath: odh-ca-bundle.crt
219219
imagePullSecrets:

‎tests/test-case.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,16 @@ spec:
110110
- mountPath: /home/ray/workspace/tls
111111
name: server-cert
112112
readOnly: true
113-
- mountPath: /etc/pki/tls/certs
113+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
114114
name: odh-trusted-ca-cert
115115
subPath: odh-trusted-ca-bundle.crt
116-
- mountPath: /etc/ssl/certs
116+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
117117
name: odh-trusted-ca-cert
118118
subPath: odh-trusted-ca-bundle.crt
119-
- mountPath: /etc/pki/tls/certs
119+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
120120
name: odh-ca-cert
121121
subPath: odh-ca-bundle.crt
122-
- mountPath: /etc/ssl/certs
122+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
123123
name: odh-ca-cert
124124
subPath: odh-ca-bundle.crt
125125
imagePullSecrets:
@@ -202,16 +202,16 @@ spec:
202202
- mountPath: /home/ray/workspace/tls
203203
name: server-cert
204204
readOnly: true
205-
- mountPath: /etc/pki/tls/certs
205+
- mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
206206
name: odh-trusted-ca-cert
207207
subPath: odh-trusted-ca-bundle.crt
208-
- mountPath: /etc/ssl/certs
208+
- mountPath: /etc/ssl/certs/odh-trusted-ca-bundle.crt
209209
name: odh-trusted-ca-cert
210210
subPath: odh-trusted-ca-bundle.crt
211-
- mountPath: /etc/pki/tls/certs
211+
- mountPath: /etc/pki/tls/certs/odh-ca-bundle.crt
212212
name: odh-ca-cert
213213
subPath: odh-ca-bundle.crt
214-
- mountPath: /etc/ssl/certs
214+
- mountPath: /etc/ssl/certs/odh-ca-bundle.crt
215215
name: odh-ca-cert
216216
subPath: odh-ca-bundle.crt
217217
imagePullSecrets:

0 commit comments

Comments
 (0)