mirror of
https://github.com/hanzo-ml/spark-operator.git
synced 2026-10-30 20:39:07 +00:00
* fix(rbac): Fix Helm RBAC bugs, add trailing newline, and add unit test assertions - Fix missing sparkconnects/finalizers: update block in controller policyRules - Remove services: patch (no r.client.Patch on services) - Remove scheduledsparkapplications/finalizers: patch (only update needed) - Add trailing newline to webhook/_helpers.tpl - Add 16 rule-content assertions to controller RBAC unit tests - Add 5 rule-content assertions to webhook RBAC unit tests - Add verify-helm-rbac.sh script for manual PR validation - Added patch back to services in controller/_helpers.tpl - Added list and watch back to sparkapplications in webhook/_helpers.tpl - moved services:patch, webhook list sparkapplication, webhook watch sparkapplication moved to yes section in test script Signed-off-by: roburishabh <[email protected]> * removed verification script Signed-off-by: roburishabh <[email protected]> * fix(e2e): Fix namespace filtering test race condition and webhook RBAC for namespace selector Signed-off-by: roburishabh <[email protected]> --------- Signed-off-by: roburishabh <[email protected]>
183 lines
5.0 KiB
YAML
183 lines
5.0 KiB
YAML
{{/*
|
|
Copyright 2024 The Kubeflow authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
https://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.controller.rbac.create -}}
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: ClusterRole
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.clusterRoleName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" . | nindent 4 }}
|
|
{{- with .Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
rules:
|
|
{{- if .Values.spark.jobNamespaceSelector }}
|
|
# When namespace selector is used, controller needs permissions to discover namespaces
|
|
- apiGroups:
|
|
- ""
|
|
resources:
|
|
- namespaces
|
|
verbs:
|
|
- get
|
|
- list
|
|
- watch
|
|
{{- end }}
|
|
{{- if or (not .Values.spark.jobNamespaces) (has "" .Values.spark.jobNamespaces) .Values.spark.jobNamespaceSelector }}
|
|
# Include cluster-wide permissions when:
|
|
# 1. jobNamespaces is not set (watch all)
|
|
# 2. jobNamespaces contains "" (watch all)
|
|
# 3. jobNamespaceSelector is set (dynamic discovery)
|
|
{{ include "spark-operator.controller.policyRules" . }}
|
|
{{- end }}
|
|
- apiGroups:
|
|
- apiextensions.k8s.io
|
|
resources:
|
|
- customresourcedefinitions
|
|
verbs:
|
|
- get
|
|
---
|
|
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: ClusterRoleBinding
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.clusterRoleBindingName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" . | nindent 4 }}
|
|
{{- with .Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
subjects:
|
|
- kind: ServiceAccount
|
|
name: {{ include "spark-operator.controller.serviceAccountName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
roleRef:
|
|
apiGroup: rbac.authorization.k8s.io
|
|
kind: ClusterRole
|
|
name: {{ include "spark-operator.controller.clusterRoleName" . }}
|
|
---
|
|
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: Role
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.roleName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" . | nindent 4 }}
|
|
{{- with .Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
rules:
|
|
{{- if .Values.controller.leaderElection.enable }}
|
|
- apiGroups:
|
|
- coordination.k8s.io
|
|
resources:
|
|
- leases
|
|
verbs:
|
|
- create
|
|
- apiGroups:
|
|
- coordination.k8s.io
|
|
resources:
|
|
- leases
|
|
resourceNames:
|
|
- {{ include "spark-operator.controller.leaderElectionName" . }}
|
|
verbs:
|
|
- get
|
|
- update
|
|
{{- end }}
|
|
{{- if has .Release.Namespace .Values.spark.jobNamespaces }}
|
|
{{ include "spark-operator.controller.policyRules" . }}
|
|
{{- else }}
|
|
- apiGroups:
|
|
- ""
|
|
resources:
|
|
- events
|
|
verbs:
|
|
- create
|
|
- update
|
|
- patch
|
|
{{- end }}
|
|
---
|
|
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: RoleBinding
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.roleBindingName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" . | nindent 4 }}
|
|
{{- with .Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
subjects:
|
|
- kind: ServiceAccount
|
|
name: {{ include "spark-operator.controller.serviceAccountName" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
roleRef:
|
|
apiGroup: rbac.authorization.k8s.io
|
|
kind: Role
|
|
name: {{ include "spark-operator.controller.roleName" . }}
|
|
|
|
{{- if and .Values.spark.jobNamespaces (not (has "" .Values.spark.jobNamespaces)) }}
|
|
{{- range $jobNamespace := .Values.spark.jobNamespaces }}
|
|
{{- if ne $jobNamespace $.Release.Namespace }}
|
|
---
|
|
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: Role
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.roleName" $ }}
|
|
namespace: {{ $jobNamespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" $ | nindent 4 }}
|
|
{{- with $.Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
rules:
|
|
{{ include "spark-operator.controller.policyRules" $ }}
|
|
---
|
|
|
|
apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: RoleBinding
|
|
metadata:
|
|
name: {{ include "spark-operator.controller.roleBindingName" $ }}
|
|
namespace: {{ $jobNamespace }}
|
|
labels:
|
|
{{- include "spark-operator.controller.labels" $ | nindent 4 }}
|
|
{{- with $.Values.controller.rbac.annotations }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
subjects:
|
|
- kind: ServiceAccount
|
|
name: {{ include "spark-operator.controller.serviceAccountName" $ }}
|
|
namespace: {{ $.Release.Namespace }}
|
|
roleRef:
|
|
apiGroup: rbac.authorization.k8s.io
|
|
kind: Role
|
|
name: {{ include "spark-operator.controller.roleName" $ }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|