fix(argo-cd): skip empty configmap params (#1892)
This commit is contained in:
parent
832a1e5c10
commit
71f61651ae
2 changed files with 6 additions and 3 deletions
|
@ -3,7 +3,7 @@ appVersion: v2.6.4
|
|||
kubeVersion: ">=1.22.0-0"
|
||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 5.24.3
|
||||
version: 5.24.4
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||
sources:
|
||||
|
@ -24,4 +24,4 @@ dependencies:
|
|||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- kind: fixed
|
||||
description: Clarify syntax in values.yaml
|
||||
description: Updated argocd-cm to skip empty values
|
||||
|
|
|
@ -174,7 +174,10 @@ Merge Argo Configuration with Preset Configuration
|
|||
{{- $config := (mergeOverwrite (deepCopy (omit .Values.configs.cm "create" "annotations")) (.Values.server.config | default dict)) -}}
|
||||
{{- $preset := include "argo-cd.config.cm.presets" . | fromYaml | default dict -}}
|
||||
{{- range $key, $value := mergeOverwrite $preset $config }}
|
||||
{{ $key }}: {{ toString $value | toYaml }}
|
||||
{{- $fmted := $value | toString }}
|
||||
{{- if not (eq $fmted "") }}
|
||||
{{ $key }}: {{ $fmted | toYaml }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
|
|
Loading…
Reference in a new issue