Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

Commit 0fb2215

Browse files
Simon-Liowainlewis
authored andcommitted
Fix installing in a different namespace (#217)
Signed-off-by: SimonLi <simon.jiyou@gmail.com> Updates
1 parent 8f46c93 commit 0fb2215

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

mysql-operator/templates/02-rbac.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: mysql-operator
6-
namespace: {{ if .Values.operator.global }}mysql-operator{{ else }}{{ .Values.operator.namespace}}{{ end }}
6+
namespace: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}mysql-operator{{ else }}{{ .Values.operator.namespace}}{{ end }}
77

88
---
99
apiVersion: v1
1010
kind: ServiceAccount
1111
metadata:
1212
name: mysql-agent
13-
namespace: {{ if .Values.operator.global }}default{{ else }}{{ .Values.operator.namespace}}{{ end }}
13+
namespace: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}default{{ else }}{{ .Values.operator.namespace}}{{ end }}
1414

1515
---
1616
{{- if .Values.rbac.enabled -}}
1717
apiVersion: rbac.authorization.k8s.io/v1beta1
18-
kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
18+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
1919
metadata:
20-
name: mysql-operator{{ if .Values.operator.global }}{{ else}}
20+
name: mysql-operator{{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}{{ else}}
2121
namespace: {{ .Values.operator.namespace}}{{ end }}
2222
rules:
2323
- apiGroups: [""]
@@ -86,9 +86,9 @@ rules:
8686

8787
---
8888
apiVersion: rbac.authorization.k8s.io/v1beta1
89-
kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
89+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
9090
metadata:
91-
name: mysql-agent{{ if .Values.operator.global }}{{ else}}
91+
name: mysql-agent{{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}{{ else}}
9292
namespace: {{ .Values.operator.namespace}}{{ end }}
9393
rules:
9494
- apiGroups: [""]
@@ -127,13 +127,13 @@ rules:
127127

128128
---
129129
apiVersion: rbac.authorization.k8s.io/v1beta1
130-
kind: {{ if .Values.operator.global }}Cluster{{ end }}RoleBinding
130+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}RoleBinding
131131
metadata:
132132
name: mysql-operator
133133
namespace: {{ .Values.operator.namespace}}
134134
roleRef:
135135
apiGroup: rbac.authorization.k8s.io
136-
kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
136+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
137137
name: mysql-operator
138138
subjects:
139139
- kind: ServiceAccount
@@ -142,13 +142,13 @@ subjects:
142142

143143
---
144144
apiVersion: rbac.authorization.k8s.io/v1beta1
145-
kind: {{ if .Values.operator.global }}Cluster{{ end }}RoleBinding
145+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}RoleBinding
146146
metadata:
147147
name: mysql-agent
148148
namespace: {{ .Values.operator.namespace}}
149149
roleRef:
150150
apiGroup: rbac.authorization.k8s.io
151-
kind: {{ if .Values.operator.global }}Cluster{{ end }}Role
151+
kind: {{ if and (.Values.operator.global) (eq .Values.operator.namespace "mysql-operator") }}Cluster{{ end }}Role
152152
name: mysql-agent
153153
subjects:
154154
- kind: ServiceAccount

0 commit comments

Comments
 (0)