From 1f42ea74f55e1d1f87115c9e31a91eeefd8ccaa0 Mon Sep 17 00:00:00 2001 From: Petr Drastil Date: Thu, 10 Nov 2022 02:55:40 +0100 Subject: [PATCH] fix(argo-cd): Use raw json for cluster credentials for Vault compatibility (#1634) Signed-off-by: Petr Drastil Signed-off-by: Petr Drastil Co-authored-by: Aikawa --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 5d4aad14..01ad0b08 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.6 +version: 5.13.7 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: | - - "[Changed]: Upgrade Argo CD to 2.5.2" + - "[Fixed]: Use raw json format for cluster credentials for Vault plugin compatibility" diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index fce3211e..7438d029 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -26,6 +26,5 @@ stringData: clusterResources: {{ .clusterResources | quote }} {{- end }} {{- end }} - config: | - {{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }} + config: {{ required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toRawJson }} {{- end }}