Helm chart fixes

ProtocolONE · Apr 22, 2020 · 47d34ee · 47d34ee
1 parent e0070fd
commit 47d34ee
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/.helm/templates/rbac.yaml b/.helm/templates/rbac.yaml
@@ -1,17 +1,16 @@
 {{- $deployment := .Values.backend -}}
 {{- $deploymentName := printf "%s-%s" .Release.Name $deployment.name }}
-{{- $namespace := printf "ps-%s" .Release.Name }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: {{ $namespace }}
+  namespace: {{ .Release.Namespace }}
   name: {{ .Release.Name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ .Release.Name }}
-  namespace: {{ $namespace }}
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""]
   resources: 
@@ -30,7 +29,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ .Release.Name }}
-  #namespace: {{ $namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -43,13 +42,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Release.Name }}-list-pods
-  #namespace: {{ $namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: paysuper-list-pods
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}
-  #namespace: {{ $namespace }}
-  #namespace: default
+  namespace: {{ .Release.Namespace }}