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

fix(argo-cd): Cluster credentials config should be a string (#1636)

Browse source 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil 2022-11-11 03:11:27 +01:00 committed by GitHub
parent 1f42ea74f5
commit 07c6fc368a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 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.5.2
kubeVersion: ">=1.22.0-0" kubeVersion: ">=1.22.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.13.7 version: 5.13.8
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:
@ -23,4 +23,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Fixed]: Use raw json format for cluster credentials for Vault plugin compatibility" - "[Fixed]: Cluster credentials JSON config must be always converted to the string"

3
charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml
View file

@ -26,5 +26,6 @@ stringData:
clusterResources: {{ .clusterResources | quote }} clusterResources: {{ .clusterResources | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
config: {{ required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toRawJson }} config: |
{{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toRawJson | nindent 4 }}
{{- end }} {{- end }}