From 326d87a70cae28564e30d9c6c9114376b48a1cb9 Mon Sep 17 00:00:00 2001 From: Matthias Lisin <6209465+ml-@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:57:52 +0100 Subject: [PATCH] fix(argo-cd): Expose clusterResources in cluster secret (#1131) * fix(argo-cd): Expose clusterResources in cluster secret Signed-off-by: Matthias Lisin * Change indent Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 4 ++-- .../argo-cd/templates/argocd-configs/cluster-secrets.yaml | 7 +++++-- charts/argo-cd/values.yaml | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 1b90d81d..c599ec2a 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.2.5 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.34.0 +version: 3.35.0 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Changed]: Always mount argocd-tls-certs-cm in server and repo-server" + - "[Added]: Expose 'clusterResources' parameter in configs.clusterCredentials" diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index 147fab51..a9f865da 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -20,8 +20,11 @@ type: Opaque stringData: name: {{ required "A valid .Values.configs.clusterCredentials[].name entry is required!" .name }} server: {{ required "A valid .Values.configs.clusterCredentials[].server entry is required!" .server }} - {{- with .namespaces }} - namespaces: {{ . }} + {{- if .namespaces }} + namespaces: {{ .namespaces }} + {{- if .clusterResources }} + clusterResources: {{ .clusterResources }} + {{- end }} {{- end }} config: | {{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 4f9a2c62..f54d470a 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1670,6 +1670,7 @@ configs: # labels: {} # annotations: {} # namespaces: namespace1,namespace2 + # clusterResources: true # config: # bearerToken: "" # tlsClientConfig: