Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into dev-aka
Browse files Browse the repository at this point in the history
  • Loading branch information
AronKa-SAG committed Jun 17, 2024
2 parents f6cf10b + 84cafa7 commit f8e169a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions common/helm/templates/_metering.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@ Usage:
value: "{{ .Values.metering.logLevel }}"
- name: "METERING_TRUSTSTORE_FILE"
value: "{{ .Values.metering.trustStoreFile }}"
{{- if .Values.metering.truststorePasswordFromSecret.enabled -}}
- name: "METERING_TRUSTSTORE_PASSWORD"
{{- if .Values.metering.trustStorePasswordFromSecret.enabled -}}
valueFrom:
secretKeyRef:
name: "{{ .Values.metering.truststorePasswordFromSecret.secretName }}"
key: "{{ .Values.metering.truststorePasswordFromSecret.secretKey }}"
name: "{{ .Values.metering.trustStorePasswordFromSecret.secretName }}"
key: "{{ .Values.metering.trustStorePasswordFromSecret.secretKey }}"
{{- else -}}
- name: "METERING_TRUSTSTORE_PASSWORD"
value: "{{ .Values.metering.trustStorePassword }}"
{{- end -}}
{{- end -}}
Expand Down

0 comments on commit f8e169a

Please sign in to comment.