fix: fix issue #1723 about spark-operator not working with volcano on…

… OCP (#1724) * fix: fix issue #1723 about spark-operator not working with volcano on OCP Signed-off-by: disaster37 <linuxworkgroup@hotmail.com> * Update volcano_scheduler.go --------- Signed-off-by: disaster37 <linuxworkgroup@hotmail.com>
kubeflow · Nov 9, 2023 · 8cb6c80 · 8cb6c80
1 parent b49b1b4
commit 8cb6c80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/charts/spark-operator-chart/templates/rbac.yaml b/charts/spark-operator-chart/templates/rbac.yaml
@@ -85,8 +85,10 @@ rules:
   resources:
   - sparkapplications
   - sparkapplications/status
+  - sparkapplications/finalizers
   - scheduledsparkapplications
   - scheduledsparkapplications/status
+  - scheduledsparkapplications/finalizers
   verbs:
   - "*"
   {{- if .Values.batchScheduler.enable }}

diff --git a/manifest/spark-operator-install/spark-operator-rbac.yaml b/manifest/spark-operator-install/spark-operator-rbac.yaml
@@ -58,7 +58,7 @@ rules:
   resources: ["mutatingwebhookconfigurations", "validatingwebhookconfigurations"]
   verbs: ["create", "get", "update", "delete"]
 - apiGroups: ["sparkoperator.k8s.io"]
-  resources: ["sparkapplications", "scheduledsparkapplications", "sparkapplications/status", "scheduledsparkapplications/status"]
+  resources: ["sparkapplications", "scheduledsparkapplications", "sparkapplications/status", "scheduledsparkapplications/status", "sparkapplications/finalizers", "scheduledsparkapplications/finalizers"]
   verbs: ["*"]
 - apiGroups: ["scheduling.volcano.sh"]
   resources: ["podgroups", "queues", "queues/status"]

diff --git a/pkg/batchscheduler/volcano/volcano_scheduler.go b/pkg/batchscheduler/volcano/volcano_scheduler.go
@@ -115,9 +115,12 @@ func (v *VolcanoBatchScheduler) getAppPodGroupName(app *v1beta2.SparkApplication
 }
 
 func (v *VolcanoBatchScheduler) syncPodGroup(app *v1beta2.SparkApplication, size int32, minResource corev1.ResourceList) error {
-	var err error
+	var (
+		err error
+		pg  *v1beta1.PodGroup
+	)
 	podGroupName := v.getAppPodGroupName(app)
-	if pg, err := v.volcanoClient.SchedulingV1beta1().PodGroups(app.Namespace).Get(context.TODO(), podGroupName, metav1.GetOptions{}); err != nil {
+	if pg, err = v.volcanoClient.SchedulingV1beta1().PodGroups(app.Namespace).Get(context.TODO(), podGroupName, metav1.GetOptions{}); err != nil {
 		if !errors.IsNotFound(err) {
 			return err
 		}