From 07c6fc368a58f08228ec64579e79661db174c52a Mon Sep 17 00:00:00 2001 From: Petr Drastil Date: Fri, 11 Nov 2022 03:11:27 +0100 Subject: [PATCH] fix(argo-cd): Cluster credentials config should be a string (#1636) Signed-off-by: Petr Drastil Signed-off-by: Petr Drastil --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 01ad0b08..ac34b43e 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.5.2 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.13.7 +version: 5.13.8 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -23,4 +23,4 @@ dependencies: condition: redis-ha.enabled annotations: 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" diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index 7438d029..aba14db7 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -26,5 +26,6 @@ stringData: clusterResources: {{ .clusterResources | quote }} {{- 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 }}