@@ -166,32 +166,52 @@ spec:
166
166
value : " true"
167
167
{{- end }}
168
168
{{- if and .Values.tls.enabled .Values.tls.usePemCerts (or .Values.tls.keyPassword .Values.tls.passwordsSecret) }}
169
+ {{- if .Values.usePasswordFiles }}
170
+ - name : KIBANA_SERVER_KEY_PASSWORD_FILE
171
+ value : " /opt/bitnami/kibana/secrets/kibana-key-password"
172
+ {{- else }}
169
173
- name : KIBANA_SERVER_KEY_PASSWORD
170
174
valueFrom :
171
175
secretKeyRef :
172
176
name : {{ include "kibana.tls.secretName" . }}
173
177
key : kibana-key-password
174
178
{{- end }}
179
+ {{- end }}
175
180
{{- if and .Values.tls.enabled (not .Values.tls.usePemCerts) (or .Values.tls.keystorePassword .Values.tls.passwordsSecret) }}
181
+ {{- if .Values.usePasswordFiles }}
182
+ - name : KIBANA_SERVER_KEYSTORE_PASSWORD_FILE
183
+ value : " /opt/bitnami/kibana/secrets/kibana-keystore-password"
184
+ {{- else }}
176
185
- name : KIBANA_SERVER_KEYSTORE_PASSWORD
177
186
valueFrom :
178
187
secretKeyRef :
179
188
name : {{ include "kibana.tls.secretName" . }}
180
189
key : kibana-keystore-password
181
190
{{- end }}
191
+ {{- end }}
182
192
{{- if .Values.elasticsearch.security.auth.enabled }}
193
+ {{- if .Values.usePasswordFiles }}
194
+ - name : KIBANA_PASSWORD_FILE
195
+ value : " /opt/bitnami/kibana/secrets/kibana-password"
196
+ {{- else }}
183
197
- name : KIBANA_PASSWORD
184
198
valueFrom :
185
199
secretKeyRef :
186
200
name : {{ include "kibana.elasticsearch.auth.secretName" . }}
187
201
key : kibana-password
188
202
{{- end }}
203
+ {{- end }}
189
204
{{- if and .Values.elasticsearch.security.auth.enabled .Values.elasticsearch.security.auth.createSystemUser }}
205
+ {{- if .Values.usePasswordFiles }}
206
+ - name : KIBANA_ELASTICSEARCH_PASSWORD_FILE
207
+ value : " /opt/bitnami/kibana/secrets/elasticsearch-password"
208
+ {{- else }}
190
209
- name : KIBANA_ELASTICSEARCH_PASSWORD
191
210
valueFrom :
192
211
secretKeyRef :
193
212
name : {{ tpl .Values.elasticsearch.security.auth.elasticsearchPasswordSecret . }}
194
213
key : elasticsearch-password
214
+ {{- end }}
195
215
- name : KIBANA_CREATE_USER
196
216
value : " true"
197
217
{{- end }}
@@ -202,12 +222,17 @@ spec:
202
222
- name : KIBANA_ELASTICSEARCH_TLS_VERIFICATION_MODE
203
223
value : {{ .Values.elasticsearch.security.tls.verificationMode | quote }}
204
224
{{- if and .Values.elasticsearch.security.tls.enabled (not .Values.elasticsearch.security.tls.usePemCerts) (or .Values.elasticsearch.security.tls.truststorePassword .Values.elasticsearch.security.tls.passwordsSecret) }}
225
+ {{- if .Values.usePasswordFiles }}
226
+ - name : KIBANA_ELASTICSEARCH_TRUSTSTORE_PASSWORD_FILE
227
+ value : " /opt/bitnami/kibana/secrets/elasticsearch-truststore-password"
228
+ {{- else }}
205
229
- name : KIBANA_ELASTICSEARCH_TRUSTSTORE_PASSWORD
206
230
valueFrom :
207
231
secretKeyRef :
208
232
name : {{ include "kibana.elasticsearch.tls.secretName" . }}
209
233
key : elasticsearch-truststore-password
210
234
{{- end }}
235
+ {{- end }}
211
236
{{- if .Values.extraEnvVars }}
212
237
{{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
213
238
{{- end }}
@@ -274,6 +299,10 @@ spec:
274
299
mountPath : /bitnami/kibana
275
300
- name : kibana-config
276
301
mountPath : /bitnami/kibana/conf
302
+ {{- if and .Values.usePasswordFiles (or .Values.elasticsearch.security.auth.enabled (and .Values.tls.enabled (or .Values.tls.passwordsSecret (ternary .Values.tls.keyPassword .Values.tls.keystorePassword .Values.tls.usePemCerts)))) }}
303
+ - name : kibana-secrets
304
+ mountPath : /opt/bitnami/kibana/secrets
305
+ {{- end }}
277
306
{{- if .Values.tls.enabled }}
278
307
- name : kibana-certificates
279
308
mountPath : /opt/bitnami/kibana/config/certs/server
@@ -313,6 +342,29 @@ spec:
313
342
volumes :
314
343
- name : empty-dir
315
344
emptyDir : {}
345
+ {{- if and .Values.usePasswordFiles (or .Values.elasticsearch.security.auth.enabled
346
+ (and .Values.elasticsearch.security.tls.enabled (not .Values.elasticsearch.security.tls.usePemCerts) (or .Values.elasticsearch.security.tls.truststorePassword .Values.elasticsearch.security.tls.passwordsSecret))
347
+ (and .Values.tls.enabled (or .Values.tls.passwordsSecret (ternary .Values.tls.keyPassword .Values.tls.keystorePassword .Values.tls.usePemCerts)))) }}
348
+ - name : kibana-secrets
349
+ projected :
350
+ sources :
351
+ {{- if and .Values.tls.enabled (or .Values.tls.passwordsSecret (ternary .Values.tls.keyPassword .Values.tls.keystorePassword .Values.tls.usePemCerts)) }}
352
+ - secret :
353
+ name : {{ include "kibana.tls.secretName" . }}
354
+ {{- end }}
355
+ {{- if .Values.elasticsearch.security.auth.enabled }}
356
+ - secret :
357
+ name : {{ include "kibana.elasticsearch.auth.secretName" . }}
358
+ {{- end }}
359
+ {{- if and .Values.elasticsearch.security.auth.enabled .Values.elasticsearch.security.auth.createSystemUser }}
360
+ - secret :
361
+ name : {{ tpl .Values.elasticsearch.security.auth.elasticsearchPasswordSecret . }}
362
+ {{- end }}
363
+ {{- if and .Values.elasticsearch.security.tls.enabled (not .Values.elasticsearch.security.tls.usePemCerts) (or .Values.elasticsearch.security.tls.truststorePassword .Values.elasticsearch.security.tls.passwordsSecret) }}
364
+ - secret :
365
+ name : {{ include "kibana.elasticsearch.tls.secretName" . }}
366
+ {{- end }}
367
+ {{- end }}
316
368
- name : kibana-data
317
369
{{- if .Values.persistence.enabled }}
318
370
persistentVolumeClaim :
0 commit comments