From c2377094564ca3d97f4e7939ff04f109b721e35f Mon Sep 17 00:00:00 2001 From: ChocoPowwwa Date: Fri, 11 Oct 2019 01:21:14 +0700 Subject: [PATCH] Argocd - Add capabiility to set resource.exclustions from values.yaml (#126) * Argocd - Add capability to set resource.exclutions on argocd-cm * Argocd - Bump helm chart version to 0.6.0 and fix wrong app version --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/templates/argocd-cm.yaml | 4 ++++ charts/argo-cd/values.yaml | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 8908ec1c..cd2fcaff 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "1.2.0" +appVersion: "1.2.1" description: A Helm chart for Argo-CD name: argo-cd -version: 0.5.4 +version: 0.6.0 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml index 63db780d..e89ab72e 100644 --- a/charts/argo-cd/templates/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-cm.yaml @@ -38,6 +38,10 @@ data: resource.customizations: | {{ toYaml .Values.config.resourceCustomizations | indent 4 }} {{- end }} +{{- if .Values.config.resourceExclusions }} + resource.exclusions: | +{{ toYaml .Values.config.resourceExclusions | indent 4 }} +{{- end }} {{- if .Values.config.configManagementPlugins }} configManagementPlugins: | {{ toYaml .Values.config.configManagementPlugins | indent 4 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 77de1876..fb5c9fba 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -83,6 +83,13 @@ clusterAdminAccess: config: createSecret: true enableAnonymousAccess: false + resourceExclusions: + # - apiGroups: + # - "*" + # kinds: + # - "*" + # clusters: + # - https://192.168.0.20 helmRepositories: # - name: privateRepo # url: http://chartmuseum.privatecloud.com