From ff388f8f9402403ee69520f483bb4c05c6ac5b3f Mon Sep 17 00:00:00 2001 From: Matt Gowie Date: Mon, 8 Mar 2021 12:30:24 -0700 Subject: [PATCH] feat(argo-cd): adds configEnabled flag to allow parent chart to own CM (#591) Signed-off-by: Matt Gowie --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/argocd-cm.yaml | 4 +++- charts/argo-cd/values.yaml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2f824d08..af7da2f2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.4 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.14.9 +version: 2.15.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml index 0ce489bc..ca42e9b9 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml @@ -1,3 +1,4 @@ +{{- if .Values.server.configEnabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -16,4 +17,5 @@ metadata: {{- end }} {{- end }} data: -{{- toYaml .Values.server.config | nindent 4 }} \ No newline at end of file +{{- toYaml .Values.server.config | nindent 4 }} +{{- end }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 25bf3ad7..fee16b46 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -543,6 +543,7 @@ server: ## ArgoCD config ## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml + configEnabled: true config: # Argo CD's externally facing base URL (optional). Required when configuring SSO url: https://argocd.example.com