DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(argo-cd): remove necessary create entry in argocd-cmd-params-cm ConfigMap (#2146)

Browse source 
fix(argo-cd): remove necessary `create` entry in `argocd-cmd-params-cm` ConfigMap

Signed-off-by: Atkins Chang <atkinschang@gmail.com>
This commit is contained in:
Atkins 2023-07-04 17:22:19 +08:00 committed by GitHub
parent b9f610e319
commit 5c4506b481
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.7.6
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 5.36.14 version: 5.36.15
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -27,4 +27,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: fixed
description: Update argo-cd.strategy template description: Remove necessary `create` entry in `argocd-cmd-params-cm` ConfigMap

2
charts/argo-cd/templates/_helpers.tpl
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 }}