Fixes for NATS App Helm chart, fix template issues with config.merge value
Signed-off-by: Isaiah Olson <isaiah@olson-network.com>
This commit is contained in:
parent
19b56414a6
commit
b1ebc9cc85
1 changed files with 3 additions and 3 deletions
|
|
@ -52,7 +52,7 @@ spec:
|
|||
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 12 }}
|
||||
fullnameOverride: {{ .Release.Name }}
|
||||
config:
|
||||
{{- if or (gt (len $passwords) 0) (gt (len .Values.config.merge) 0) }}
|
||||
{{- if or (gt (len $passwords) 0) (and .Values.config (hasKey .Values.config "merge") (gt (len .Values.config.merge) 0)) }}
|
||||
merge:
|
||||
{{- if gt (len $passwords) 0 }}
|
||||
accounts:
|
||||
|
|
@ -63,8 +63,8 @@ spec:
|
|||
password: "{{ $password }}"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if and .Values.config (hasKey .Values.config "merge") }}
|
||||
{{ toYaml .Values.config.merge | nindent 12 }}
|
||||
{{- if and .Values.config (hasKey .Values.config "merge") (gt (len .Values.config.merge) 0) }}
|
||||
{{ toYaml .Values.config.merge | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if and .Values.config (hasKey .Values.config "resolver") }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue