From 3c2df5bd7ef760095314e6853907eb0d317ac69a Mon Sep 17 00:00:00 2001
From: Jakub Oskera <iam@jakuboskera.dev>
Date: Tue, 4 Apr 2023 10:35:01 +0200
Subject: [PATCH] fix(argo-cd): remove namespace field for cluster wide
 resources (#15801)

Signed-off-by: Jakub Oskera <iam@jakuboskera.dev>
---
 .../argo-cd/templates/application-controller/clusterrole.yaml    | 1 -
 .../templates/application-controller/clusterrolebinding.yaml     | 1 -
 bitnami/argo-cd/templates/server/clusterrole.yaml                | 1 -
 bitnami/argo-cd/templates/server/clusterrolebinding.yaml         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/bitnami/argo-cd/templates/application-controller/clusterrole.yaml b/bitnami/argo-cd/templates/application-controller/clusterrole.yaml
index 3164b41731..97486a7b0d 100644
--- a/bitnami/argo-cd/templates/application-controller/clusterrole.yaml
+++ b/bitnami/argo-cd/templates/application-controller/clusterrole.yaml
@@ -3,7 +3,6 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
   name: {{ include "argocd.namespace.application-controller" . }}
-  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/bitnami/argo-cd/templates/application-controller/clusterrolebinding.yaml b/bitnami/argo-cd/templates/application-controller/clusterrolebinding.yaml
index 95180cc5de..a7e338c3c9 100644
--- a/bitnami/argo-cd/templates/application-controller/clusterrolebinding.yaml
+++ b/bitnami/argo-cd/templates/application-controller/clusterrolebinding.yaml
@@ -3,7 +3,6 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "argocd.namespace.application-controller" . }}
-  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/bitnami/argo-cd/templates/server/clusterrole.yaml b/bitnami/argo-cd/templates/server/clusterrole.yaml
index ea80cc15b0..7f70dd7c7b 100644
--- a/bitnami/argo-cd/templates/server/clusterrole.yaml
+++ b/bitnami/argo-cd/templates/server/clusterrole.yaml
@@ -3,7 +3,6 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
   name: {{ include "argocd.namespace.server" . }}
-  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/bitnami/argo-cd/templates/server/clusterrolebinding.yaml b/bitnami/argo-cd/templates/server/clusterrolebinding.yaml
index 0bb7e7f1c6..87a796fc8f 100644
--- a/bitnami/argo-cd/templates/server/clusterrolebinding.yaml
+++ b/bitnami/argo-cd/templates/server/clusterrolebinding.yaml
@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
   name: {{ include "argocd.namespace.server" . }}
-  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     app.kubernetes.io/component: server
     {{- if .Values.commonLabels }}