Adds namespace in each resource

numberly · Jul 8, 2022 · 1ebb938 · 1ebb938
1 parent 7eb54c5
commit 1ebb938
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/gitlab2rbac/templates/clusterrole.yaml b/gitlab2rbac/templates/clusterrole.yaml
@@ -1,9 +1,10 @@
-{{- $Values := .Values -}}
-{{- range $type := .Values.ClusterRole.type }}
+{{- $top := . -}}
+{{- range $type := $top.Values.ClusterRole.type }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ $type.name }}
+  namespace: {{ $top.Release.Namespace }}
 rules:
 {{- toYaml $type.rules | nindent 0 }}
 

diff --git a/gitlab2rbac/templates/clusterrolebinding.yaml b/gitlab2rbac/templates/clusterrolebinding.yaml
@@ -1,9 +1,10 @@
-{{- $Values := .Values -}}
-{{- range $type := .Values.ClusterRoleBinding.type }}
+{{- $top := . -}}
+{{- range $type := $top.Values.ClusterRoleBinding.type }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ $type.name }}
+  namespace: {{ $top.Release.Namespace }}
 roleRef:
   apiGroup: {{ $type.roleRefapiGroup | default "rbac.authorization.k8s.io"}}
   kind: {{ $type.roleRefkind | default "ClusterRole" }}

diff --git a/gitlab2rbac/templates/configmap.yaml b/gitlab2rbac/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "gitlab2rbac.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab2rbac.labels" . | nindent 4 }}
 data:

diff --git a/gitlab2rbac/templates/deployment.yaml b/gitlab2rbac/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "gitlab2rbac.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab2rbac.labels" . | nindent 4 }}
 spec:

diff --git a/gitlab2rbac/templates/serviceaccount.yaml b/gitlab2rbac/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "gitlab2rbac.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab2rbac.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}