add namespace condition to provisioner and tokengen

grafana · Sep 19, 2024 · 1ca2e25 · 1ca2e25
1 parent 50ad3df
commit 1ca2e25
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/production/helm/loki/templates/provisioner/role-provisioner.yaml b/production/helm/loki/templates/provisioner/role-provisioner.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.enterprise.provisioner.enabled .Values.enterprise.enabled }}
+{{ if and .Values.enterprise.provisioner.enabled .Values.enterprise.enabled (not .Values.rbac.namespaced)}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/production/helm/loki/templates/provisioner/rolebinding-provisioner.yaml b/production/helm/loki/templates/provisioner/rolebinding-provisioner.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.enterprise.provisioner.enabled .Values.enterprise.enabled }}
+{{ if and .Values.enterprise.provisioner.enabled .Values.enterprise.enabled (not .Values.rbac.namespaced)}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/production/helm/loki/templates/tokengen/clusterrole-tokengen.yaml b/production/helm/loki/templates/tokengen/clusterrole-tokengen.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled }}
+{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled (not .Values.rbac.namespaced)}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/production/helm/loki/templates/tokengen/clusterrolebinding-tokengen.yaml b/production/helm/loki/templates/tokengen/clusterrolebinding-tokengen.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled }}
+{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled (not .Values.rbac.namespaced)}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding