From 94f4a5e56ee1d7fee6828ed3bd52c39e22d6fc9e Mon Sep 17 00:00:00 2001
From: Aikawa <yuki.kita22@gmail.com>
Date: Thu, 23 Jun 2022 15:33:44 +0900
Subject: [PATCH] feat(argo-cd): support clusterResourceBlacklist (#1335)

* feat(argo-cd):support clusterResourceBlacklist
Signed-off-by: yu-croco <yuki.kita22@gmail.com>

* fix(argo-cd): fix lint
Signed-off-by: yu-croco <yuki.kita22@gmail.com>
---
 charts/argo-cd/Chart.yaml                             | 4 ++--
 charts/argo-cd/templates/argocd-configs/projects.yaml | 4 ++++
 charts/argo-cd/values.yaml                            | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index a36fb2d1..8329fdc8 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.2
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 4.9.5
+version: 4.9.6
 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]: Update to app version 2.4.2"
+    - "[Added]: Support clusterResourceBlacklist"
diff --git a/charts/argo-cd/templates/argocd-configs/projects.yaml b/charts/argo-cd/templates/argocd-configs/projects.yaml
index 54a232c1..e1fa0fc1 100644
--- a/charts/argo-cd/templates/argocd-configs/projects.yaml
+++ b/charts/argo-cd/templates/argocd-configs/projects.yaml
@@ -31,6 +31,10 @@ spec:
   clusterResourceWhitelist:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .clusterResourceBlacklist }}
+  clusterResourceBlacklist:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .namespaceResourceBlacklist }}
   namespaceResourceBlacklist:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9d56a4dc..e7b96125 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1344,6 +1344,7 @@ server:
   #   - namespace: guestbook
   #     server: https://kubernetes.default.svc
   #   clusterResourceWhitelist: []
+  #   clusterResourceBlacklist: []
   #   namespaceResourceBlacklist:
   #   - group: ''
   #     kind: ResourceQuota