From c2e00c36edf56e71db2d91a9d213a81ad395f76f Mon Sep 17 00:00:00 2001
From: SimonLi <Simon.jiyou@gmail.com>
Date: Sun, 9 Sep 2018 15:14:01 +0800
Subject: [PATCH] fix installing in a different namespace

Signed-off-by: SimonLi <simon.jiyou@gmail.com>

Updates
---
 mysql-operator/templates/02-rbac.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-operator/templates/02-rbac.yaml b/mysql-operator/templates/02-rbac.yaml
index d2cb64a5d..39688516b 100644
--- a/mysql-operator/templates/02-rbac.yaml
+++ b/mysql-operator/templates/02-rbac.yaml
@@ -3,21 +3,21 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: mysql-operator
-  namespace: {{ if .Values.operator.global }}mysql-operator{{ else }}{{ .Values.operator.namespace}}{{ end }}
+  namespace: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}mysql-operator{{ else }}{{ .Values.operator.namespace}}{{ end }}
 
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: mysql-agent
-  namespace: {{ if .Values.operator.global }}default{{ else }}{{ .Values.operator.namespace}}{{ end }}
+  namespace: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}default{{ else }}{{ .Values.operator.namespace}}{{ end }}
 
 ---
 {{- if .Values.rbac.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
+kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
 metadata:
-  name: mysql-operator{{ if .Values.operator.global }}{{ else}}
+  name: mysql-operator{{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}{{ else}}
   namespace: {{ .Values.operator.namespace}}{{ end }}
 rules:
   - apiGroups: [""]
@@ -86,9 +86,9 @@ rules:
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
+kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
 metadata:
-  name: mysql-agent{{ if .Values.operator.global }}{{ else}}
+  name: mysql-agent{{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}{{ else}}
   namespace: {{ .Values.operator.namespace}}{{ end }}
 rules:
   - apiGroups: [""]
@@ -127,13 +127,13 @@ rules:
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
-kind:  {{ if .Values.operator.global }}Cluster{{ end }}RoleBinding
+kind:  {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}RoleBinding
 metadata:
   name: mysql-operator
   namespace: {{ .Values.operator.namespace}}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind:  {{ if .Values.operator.global }}Cluster{{ end }}Role
+  kind:  {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
   name: mysql-operator
 subjects:
 - kind: ServiceAccount
@@ -142,13 +142,13 @@ subjects:
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
-kind:  {{ if .Values.operator.global }}Cluster{{ end }}RoleBinding
+kind:  {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}RoleBinding
 metadata:
   name: mysql-agent
   namespace: {{ .Values.operator.namespace}}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind:  {{ if .Values.operator.global }}Cluster{{ end }}Role
+  kind:  {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
   name: mysql-agent
 subjects:
 - kind: ServiceAccount