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

Fix installing in a different namespace #217

Merged
merged 1 commit into from
Sep 17, 2018
Merged

Fix installing in a different namespace #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions mysql-operator/templates/02-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [""]
Expand Down Expand Up @@ -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: [""]
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down