@@ -198,18 +198,28 @@ spec:
198
198
value : {{ include "wordpress.databaseName" . | quote }}
199
199
- name : WORDPRESS_DATABASE_USER
200
200
value : {{ include "wordpress.databaseUser" . | quote }}
201
+ {{- if .Values.usePasswordFiles }}
202
+ - name : WORDPRESS_DATABASE_PASSWORD_FILE
203
+ value : " /opt/bitnami/wordpress/secrets/mariadb-password"
204
+ {{- else }}
201
205
- name : WORDPRESS_DATABASE_PASSWORD
202
206
valueFrom :
203
207
secretKeyRef :
204
208
name : {{ include "wordpress.databaseSecretName" . }}
205
209
key : mariadb-password
210
+ {{- end }}
206
211
- name : WORDPRESS_USERNAME
207
212
value : {{ .Values.wordpressUsername | quote }}
213
+ {{- if .Values.usePasswordFiles }}
214
+ - name : WORDPRESS_PASSWORD_FILE
215
+ value : " /opt/bitnami/wordpress/secrets/wordpress-password"
216
+ {{- else }}
208
217
- name : WORDPRESS_PASSWORD
209
218
valueFrom :
210
219
secretKeyRef :
211
220
name : {{ include "wordpress.secretName" . }}
212
221
key : wordpress-password
222
+ {{- end }}
213
223
- name : WORDPRESS_EMAIL
214
224
value : {{ .Values.wordpressEmail | quote }}
215
225
- name : WORDPRESS_FIRST_NAME
@@ -260,12 +270,17 @@ spec:
260
270
value : {{ .Values.smtpUser | quote }}
261
271
{{- end }}
262
272
{{- if or .Values.smtpPassword .Values.smtpExistingSecret }}
273
+ {{- if .Values.usePasswordFiles }}
274
+ - name : SMTP_PASSWORD_FILE
275
+ value : " /opt/bitnami/wordpress/secrets/smtp-password"
276
+ {{- else }}
263
277
- name : SMTP_PASSWORD
264
278
valueFrom :
265
279
secretKeyRef :
266
280
name : {{ include "wordpress.smtpSecretName" . }}
267
281
key : smtp-password
268
282
{{- end }}
283
+ {{- end }}
269
284
{{- if .Values.smtpProtocol }}
270
285
- name : SMTP_PROTOCOL
271
286
value : {{ .Values.smtpProtocol | quote }}
@@ -355,6 +370,10 @@ spec:
355
370
- mountPath : /bitnami/wordpress
356
371
name : wordpress-data
357
372
subPath : wordpress
373
+ {{- if .Values.usePasswordFiles }}
374
+ - name : wordpress-secrets
375
+ mountPath : /opt/bitnami/wordpress/secrets
376
+ {{- end }}
358
377
{{- if or .Values.wordpressConfiguration .Values.existingWordPressConfigurationSecret }}
359
378
- name : wordpress-config
360
379
mountPath : /opt/bitnami/wordpress/wp-config.php
@@ -434,6 +453,19 @@ spec:
434
453
volumes :
435
454
- name : empty-dir
436
455
emptyDir : {}
456
+ {{- if .Values.usePasswordFiles }}
457
+ - name : wordpress-secrets
458
+ projected :
459
+ sources :
460
+ - secret :
461
+ name : {{ include "wordpress.secretName" . }}
462
+ - secret :
463
+ name : {{ include "wordpress.databaseSecretName" . }}
464
+ {{- if or .Values.smtpPassword .Values.smtpExistingSecret }}
465
+ - secret :
466
+ name : {{ include "wordpress.smtpSecretName" . }}
467
+ {{- end }}
468
+ {{- end }}
437
469
{{- if or .Values.wordpressConfiguration .Values.existingWordPressConfigurationSecret }}
438
470
- name : wordpress-config
439
471
secret :
0 commit comments