Merge branch 'main' into appset-checksum

Signed-off-by: Laurent Lavaud <llavaud@users.noreply.github.com>
This commit is contained in:
Laurent Lavaud 2023-07-04 15:55:48 +02:00 committed by GitHub
commit 09a1fdcbbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -207,7 +207,7 @@ applicationsetcontroller.enable.leader.election: {{ gt (.Values.applicationSet.r
Merge Argo Params Configuration with Preset Configuration Merge Argo Params Configuration with Preset Configuration
*/}} */}}
{{- define "argo-cd.config.params" -}} {{- define "argo-cd.config.params" -}}
{{- $config := omit .Values.configs.params "annotations" }} {{- $config := omit .Values.configs.params "create" "annotations" }}
{{- $preset := include "argo-cd.config.params.presets" . | fromYaml | default dict -}} {{- $preset := include "argo-cd.config.params.presets" . | fromYaml | default dict -}}
{{- range $key, $value := mergeOverwrite $preset $config }} {{- range $key, $value := mergeOverwrite $preset $config }}
{{ $key }}: {{ toString $value | toYaml }} {{ $key }}: {{ toString $value | toYaml }}