|
@@ -112,7 +112,7 @@ spec:
|
|
|
args:
|
|
|
- -ec
|
|
|
- |
|
|
|
- {{- if .Values.usePasswordFile }}
|
|
|
+ {{- if .Values.usePasswordFiles }}
|
|
|
# We need to load all the secret env vars to the system
|
|
|
for file in $(find /bitnami/zipkin/secrets -type f); do
|
|
|
env_var_name="$(basename $file)"
|
|
@@ -129,14 +129,14 @@ spec:
|
|
|
- name: JAVA_OPTS
|
|
|
value: {{ .Values.javaOpts | quote }}
|
|
|
{{- end }}
|
|
|
- {{- if and (eq .Values.storageType "cassandra3") (not .Values.usePasswordFile) }}
|
|
|
+ {{- if and (eq .Values.storageType "cassandra3") (not .Values.usePasswordFiles) }}
|
|
|
- name: CASSANDRA_PASSWORD
|
|
|
valueFrom:
|
|
|
secretKeyRef:
|
|
|
name: {{ include "zipkin.cassandra.secretName" . }}
|
|
|
key: {{ include "zipkin.cassandra.passwordKey" . | quote }}
|
|
|
{{- end }}
|
|
|
- {{- if not .Values.usePasswordFile }}
|
|
|
+ {{- if not .Values.usePasswordFiles }}
|
|
|
{{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }}
|
|
|
- name: ARMERIA_SSL_KEY_STORE_PASSWORD
|
|
|
valueFrom:
|
|
@@ -151,7 +151,7 @@ spec:
|
|
|
envFrom:
|
|
|
- configMapRef:
|
|
|
name: {{ include "zipkin.configmapName" . }}
|
|
|
- {{- if and (not .Values.usePasswordFile) (or .Values.secretConfigOverrides .Values.existingSecret) }}
|
|
|
+ {{- if and (not .Values.usePasswordFiles) (or .Values.secretConfigOverrides .Values.existingSecret) }}
|
|
|
- secretRef:
|
|
|
name: {{ include "zipkin.secretName" . }}
|
|
|
{{- end }}
|
|
@@ -215,7 +215,7 @@ spec:
|
|
|
mountPath: /bitnami/zipkin/certs
|
|
|
subPath: app-processed-certs-dir
|
|
|
{{- end }}
|
|
|
- {{- if .Values.usePasswordFile }}
|
|
|
+ {{- if .Values.usePasswordFiles }}
|
|
|
{{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }}
|
|
|
- name: keystore-password
|
|
|
mountPath: /bitnami/zipkin/secrets/keystore-password
|
|
@@ -253,7 +253,7 @@ spec:
|
|
|
path: zipkin.jks
|
|
|
{{- end }}
|
|
|
{{- end }}
|
|
|
- {{- if .Values.usePasswordFile }}
|
|
|
+ {{- if .Values.usePasswordFiles }}
|
|
|
{{- if (eq .Values.storageType "cassandra3") }}
|
|
|
- name: database-password
|
|
|
secret:
|