Support configure enableBatchScheduler (helm#16345)

Signed-off-by: TommyLike <hu.husheng@huawei.com>
arielb135 · Sep 5, 2019 · d977e1f · d977e1f
1 parent c269166
commit d977e1f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/incubator/sparkoperator/Chart.yaml b/incubator/sparkoperator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: sparkoperator
 description: A Helm chart for Spark on Kubernetes operator
-version: 0.2.7
+version: 0.2.8
 appVersion: v2.4.0-v1beta1-0.9.0
 kubeVersion: ">=1.8.0-0"
 keywords:

diff --git a/incubator/sparkoperator/README.md b/incubator/sparkoperator/README.md
@@ -39,6 +39,7 @@ The following table lists the configurable parameters of the Spark operator char
 | `resyncInterval`          | Informer resync interval in seconds                          | 30                                     |
 | `webhookPort`             | Service port of the webhook server                           | 8080                                   |
 | `resources`               | Resources needed for the sparkoperator deployment            | {}                                     |
+| `enableBatchScheduler`    | Whether to enable batch scheduler for pod scheduling         | false                                  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. 
 
diff --git a/incubator/sparkoperator/templates/spark-operator-deployment.yaml b/incubator/sparkoperator/templates/spark-operator-deployment.yaml
@@ -64,6 +64,7 @@ spec:
         - -controller-threads={{ .Values.controllerThreads }}
         - -resync-interval={{ .Values.resyncInterval }}
         - -logtostderr
+        - -enable-batch-scheduler={{ .Values.enableBatchScheduler }}
         {{- if .Values.enableMetrics }}
         - -enable-metrics=true
         - -metrics-labels=app_type

diff --git a/incubator/sparkoperator/templates/spark-operator-rbac.yaml b/incubator/sparkoperator/templates/spark-operator-rbac.yaml
@@ -33,6 +33,13 @@ rules:
 - apiGroups: ["sparkoperator.k8s.io"]
   resources: ["sparkapplications", "scheduledsparkapplications"]
   verbs: ["*"]
+  {{- if .Values.enableBatchScheduler }}
+  # This api resources below is configured for the `volcano` batch scheduler.
+- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
+  resources: ["podgroups"]
+  verbs: ["*"]
+  {{- end }}
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/incubator/sparkoperator/values.yaml b/incubator/sparkoperator/values.yaml
@@ -38,3 +38,7 @@ nodeSelector: {}
 resources: {}
 
 logLevel: 2
+
+## Whether to enable batch scheduler for pod scheduling,
+## if enabled, end user can specify batch scheduler name in spark application.
+enableBatchScheduler: false