Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions config/rbac/operator-roles-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
namespace: mongodb
rules:
- apiGroups:
Expand Down Expand Up @@ -84,12 +84,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand Down
6 changes: 3 additions & 3 deletions config/rbac/operator-roles-pvc-resize.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-pvc-resize
name: mongodb-kubernetes-operator-mongodb-pvc-resize
namespace: mongodb
rules:
- apiGroups:
Expand All @@ -22,12 +22,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-pvc-resize-binding
name: mongodb-kubernetes-operator-mongodb-pvc-resize-binding
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator-pvc-resize
name: mongodb-kubernetes-operator-mongodb-pvc-resize
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/operator-roles-telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-cluster-telemetry
name: mongodb-kubernetes-operator-mongodb-cluster-telemetry
rules:
# Non-resource URL permissions
- nonResourceURLs:
Expand Down Expand Up @@ -36,7 +36,7 @@ metadata:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: mongodb-kubernetes-operator-cluster-telemetry
name: mongodb-kubernetes-operator-mongodb-cluster-telemetry
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand Down
15 changes: 8 additions & 7 deletions helm_chart/templates/operator-roles-base.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}
{{ if .Values.operator.createOperatorServiceAccount }}
{{- $watchNamespace := include "mongodb-kubernetes-operator.namespace" . | list }}
{{- $watchNamespace := list $ns }}
{{- if .Values.operator.watchNamespace }}
{{- $watchNamespace = regexSplit "," .Values.operator.watchNamespace -1 }}
{{- $watchNamespace = concat $watchNamespace (include "mongodb-kubernetes-operator.namespace" . | list) | uniq }}
{{- $watchNamespace = concat $watchNamespace (list $ns) | uniq }}
{{- end }}

{{- $roleScope := "Role" -}}
Expand All @@ -13,9 +14,9 @@
kind: {{ $roleScope }}
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Values.operator.name }}
name: {{ .Values.operator.name }}-{{ $ns }}
{{- if eq $roleScope "Role" }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" . }}
namespace: {{ $ns }}
{{- end }}
rules:
- apiGroups:
Expand Down Expand Up @@ -115,16 +116,16 @@ kind: RoleBinding
{{- end }}
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ $.Values.operator.name }}
name: {{ $.Values.operator.name }}-{{ $ns }}
{{ $namespaceBlock }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: {{ $roleScope }}
name: {{ $.Values.operator.name }}
name: {{ $.Values.operator.name }}-{{ $ns }}
subjects:
- kind: ServiceAccount
name: {{ $.Values.operator.name }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" $ }}
namespace: {{ $ns }}
{{- end }}

{{- end }}
10 changes: 6 additions & 4 deletions helm_chart/templates/operator-roles-clustermongodbroles.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}

{{ if .Values.operator.createOperatorServiceAccount }}
{{- if .Values.operator.enableClusterMongoDBRoles }}
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Values.operator.name }}-{{ include "mongodb-kubernetes-operator.namespace" . }}-cluster-mongodb-role
name: {{ .Values.operator.name }}-{{ $ns }}-cluster-mongodb-role
rules:
- apiGroups:
- mongodb.com
Expand All @@ -16,15 +18,15 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Values.operator.name }}-{{ include "mongodb-kubernetes-operator.namespace" . }}-cluster-mongodb-role-binding
name: {{ .Values.operator.name }}-{{ $ns }}-cluster-mongodb-role-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Values.operator.name }}-{{ include "mongodb-kubernetes-operator.namespace" . }}-cluster-mongodb-role
name: {{ .Values.operator.name }}-{{ $ns }}-cluster-mongodb-role
subjects:
- kind: ServiceAccount
name: {{ .Values.operator.name }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" . }}
namespace: {{ $ns }}

{{- end }}{{/* if .Values.operator.enableClusterMongoDBRoles */}}
{{- end }}{{/* if .Values.operator.createOperatorServiceAccount */}}
15 changes: 8 additions & 7 deletions helm_chart/templates/operator-roles-pvc-resize.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}
{{ if .Values.operator.createOperatorServiceAccount }}
{{ if .Values.operator.enablePVCResize }}

{{- $watchNamespace := include "mongodb-kubernetes-operator.namespace" . | list }}
{{- $watchNamespace := list $ns }}
{{- if .Values.operator.watchNamespace }}
{{- $watchNamespace = regexSplit "," .Values.operator.watchNamespace -1 }}
{{- $watchNamespace = concat $watchNamespace (include "mongodb-kubernetes-operator.namespace" . | list) | uniq }}
{{- $watchNamespace = concat $watchNamespace (list $ns) | uniq }}
{{- end }}


Expand All @@ -16,9 +17,9 @@
kind: {{ $roleScope }}
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Values.operator.name }}-pvc-resize
name: {{ .Values.operator.name }}-{{ $ns }}-pvc-resize
{{- if eq $roleScope "Role" }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" . }}
namespace: {{ $ns }}
{{- end }}
rules:
- apiGroups:
Expand Down Expand Up @@ -47,16 +48,16 @@ kind: RoleBinding
{{- end }}
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ $.Values.operator.name }}-pvc-resize-binding
name: {{ $.Values.operator.name }}-{{ $ns }}-pvc-resize-binding
{{ $namespaceBlock }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: {{ $roleScope }}
name: {{ $.Values.operator.name }}-pvc-resize
name: {{ $.Values.operator.name }}-{{ $ns }}-pvc-resize
subjects:
- kind: ServiceAccount
name: {{ $.Values.operator.name }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" $ }}
namespace: {{ $ns }}
{{- end }}

{{- end}}{{/* if .Values.operator.enablePVCResize */}}
Expand Down
7 changes: 4 additions & 3 deletions helm_chart/templates/operator-roles-telemetry.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $clusterRoleName := printf "%s-cluster-telemetry" .Values.operator.name }}
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}
{{- $clusterRoleName := printf "%s-%s-cluster-telemetry" .Values.operator.name $ns }}
{{- $telemetry := default dict .Values.operator.telemetry }}

{{/* We can't use default here, as 0, false and nil as determined as unset and thus set the default value */}}
Expand Down Expand Up @@ -37,14 +38,14 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Values.operator.name }}-{{ include "mongodb-kubernetes-operator.namespace" . }}-cluster-telemetry-binding
name: {{ .Values.operator.name }}-{{ $ns }}-cluster-telemetry-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ $clusterRoleName }}
subjects:
- kind: ServiceAccount
name: {{ .Values.operator.name }}
namespace: {{ include "mongodb-kubernetes-operator.namespace" . }}
namespace: {{ $ns }}
{{- end}}{{/* if ne $telemetry.installClusterRole false */}}
{{- end }}{{/* if ne $telemetry.enabled false */}}
2 changes: 1 addition & 1 deletion helm_chart/templates/operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}
{{ $ns := include "mongodb-kubernetes-operator.namespace" . -}}

---
apiVersion: apps/v1
Expand Down
16 changes: 8 additions & 8 deletions public/mongodb-kubernetes-multi-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-multi-cluster
name: mongodb-kubernetes-operator-multi-cluster-mongodb
namespace: mongodb
rules:
- apiGroups:
Expand Down Expand Up @@ -84,12 +84,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-multi-cluster
name: mongodb-kubernetes-operator-multi-cluster-mongodb
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator-multi-cluster
name: mongodb-kubernetes-operator-multi-cluster-mongodb
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator-multi-cluster
Expand Down Expand Up @@ -126,7 +126,7 @@ subjects:
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-multi-cluster-pvc-resize
name: mongodb-kubernetes-operator-multi-cluster-mongodb-pvc-resize
namespace: mongodb
rules:
- apiGroups:
Expand All @@ -145,12 +145,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-multi-cluster-pvc-resize-binding
name: mongodb-kubernetes-operator-multi-cluster-mongodb-pvc-resize-binding
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator-multi-cluster-pvc-resize
name: mongodb-kubernetes-operator-multi-cluster-mongodb-pvc-resize
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator-multi-cluster
Expand All @@ -161,7 +161,7 @@ subjects:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-multi-cluster-cluster-telemetry
name: mongodb-kubernetes-operator-multi-cluster-mongodb-cluster-telemetry
rules:
# Non-resource URL permissions
- nonResourceURLs:
Expand Down Expand Up @@ -193,7 +193,7 @@ metadata:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: mongodb-kubernetes-operator-multi-cluster-cluster-telemetry
name: mongodb-kubernetes-operator-multi-cluster-mongodb-cluster-telemetry
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator-multi-cluster
Expand Down
16 changes: 8 additions & 8 deletions public/mongodb-kubernetes-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
namespace: mongodb
rules:
- apiGroups:
Expand Down Expand Up @@ -84,12 +84,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator
name: mongodb-kubernetes-operator-mongodb
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand Down Expand Up @@ -126,7 +126,7 @@ subjects:
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-pvc-resize
name: mongodb-kubernetes-operator-mongodb-pvc-resize
namespace: mongodb
rules:
- apiGroups:
Expand All @@ -145,12 +145,12 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-pvc-resize-binding
name: mongodb-kubernetes-operator-mongodb-pvc-resize-binding
namespace: mongodb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mongodb-kubernetes-operator-pvc-resize
name: mongodb-kubernetes-operator-mongodb-pvc-resize
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand All @@ -161,7 +161,7 @@ subjects:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: mongodb-kubernetes-operator-cluster-telemetry
name: mongodb-kubernetes-operator-mongodb-cluster-telemetry
rules:
# Non-resource URL permissions
- nonResourceURLs:
Expand Down Expand Up @@ -193,7 +193,7 @@ metadata:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: mongodb-kubernetes-operator-cluster-telemetry
name: mongodb-kubernetes-operator-mongodb-cluster-telemetry
subjects:
- kind: ServiceAccount
name: mongodb-kubernetes-operator
Expand Down
Loading