From d5eb3e40399f0638c28c5e5a4e6eefdd85cf8092 Mon Sep 17 00:00:00 2001
From: Simone Esposito <chaufnet@gmail.com>
Date: Mon, 22 Jun 2020 14:47:42 +0200
Subject: [PATCH] Kubernetes manifests: Remove namespace from cluster-wide
 resources (#2241)

Fixes https://github.com/grafana/loki/issues/2234
---
 production/helm/fluent-bit/templates/clusterrole.yaml       | 1 -
 production/helm/fluent-bit/templates/podsecuritypolicy.yaml | 1 -
 production/helm/loki/templates/podsecuritypolicy.yaml       | 1 -
 production/helm/promtail/templates/clusterrole.yaml         | 1 -
 production/helm/promtail/templates/podsecuritypolicy.yaml   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/production/helm/fluent-bit/templates/clusterrole.yaml b/production/helm/fluent-bit/templates/clusterrole.yaml
index ac9239afa0309..6b1a27c2fe7d9 100644
--- a/production/helm/fluent-bit/templates/clusterrole.yaml
+++ b/production/helm/fluent-bit/templates/clusterrole.yaml
@@ -8,7 +8,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "fluent-bit-loki.fullname" . }}-clusterrole
-  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""] # "" indicates the core API group
   resources:
diff --git a/production/helm/fluent-bit/templates/podsecuritypolicy.yaml b/production/helm/fluent-bit/templates/podsecuritypolicy.yaml
index c347fdc7c6179..59f68dbe72901 100644
--- a/production/helm/fluent-bit/templates/podsecuritypolicy.yaml
+++ b/production/helm/fluent-bit/templates/podsecuritypolicy.yaml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "fluent-bit-loki.fullname" . }}
-  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "fluent-bit-loki.name" . }}
     chart: {{ template "fluent-bit-loki.chart" . }}
diff --git a/production/helm/loki/templates/podsecuritypolicy.yaml b/production/helm/loki/templates/podsecuritypolicy.yaml
index 6a6444e3fa0e0..9968b4844b06d 100644
--- a/production/helm/loki/templates/podsecuritypolicy.yaml
+++ b/production/helm/loki/templates/podsecuritypolicy.yaml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "loki.fullname" . }}
-  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}
diff --git a/production/helm/promtail/templates/clusterrole.yaml b/production/helm/promtail/templates/clusterrole.yaml
index 7260d2e1078d7..b872041b7a0ec 100644
--- a/production/helm/promtail/templates/clusterrole.yaml
+++ b/production/helm/promtail/templates/clusterrole.yaml
@@ -8,7 +8,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "promtail.fullname" . }}-clusterrole
-  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""] # "" indicates the core API group
   resources:
diff --git a/production/helm/promtail/templates/podsecuritypolicy.yaml b/production/helm/promtail/templates/podsecuritypolicy.yaml
index abaca89bf1b28..a38595eeef28c 100644
--- a/production/helm/promtail/templates/podsecuritypolicy.yaml
+++ b/production/helm/promtail/templates/podsecuritypolicy.yaml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promtail.fullname" . }}
-  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}