Set podgroup to stable version (kubeflow#891)

* Set podgroup to stable version Signed-off-by: Peng Gao <[email protected]> * Update operator rbac Signed-off-by: Peng Gao <[email protected]>
arllanos · Apr 28, 2020 · b597960 · b597960
1 parent 7cd886c
commit b597960
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/manifest/spark-operator-rbac.yaml b/manifest/spark-operator-rbac.yaml
@@ -60,6 +60,9 @@ rules:
 - apiGroups: ["sparkoperator.k8s.io"]
   resources: ["sparkapplications", "scheduledsparkapplications", "sparkapplications/status", "scheduledsparkapplications/status"]
   verbs: ["*"]
+- apiGroups: ["scheduling.volcano.sh"]
+  resources: ["podgroups", "queues", "queues/status"]
+  verbs: ["get", "list", "watch", "create", "delete", "update"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/pkg/batchscheduler/volcano/volcano_scheduler.go b/pkg/batchscheduler/volcano/volcano_scheduler.go
@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	PodGroupName = "podgroups.scheduling.sigs.dev"
+	PodGroupName = "podgroups.scheduling.volcano.sh"
 )
 
 type VolcanoBatchScheduler struct {

diff --git a/pkg/controller/sparkapplication/controller.go b/pkg/controller/sparkapplication/controller.go
@@ -715,7 +715,7 @@ func (c *Controller) shouldDoBatchScheduling(app *v1beta2.SparkApplication) (boo
 
 	scheduler, err := c.batchSchedulerMgr.GetScheduler(*app.Spec.BatchScheduler)
 	if err != nil {
-		glog.Errorf("failed to get batch scheduler for name %s", *app.Spec.BatchScheduler)
+		glog.Errorf("failed to get batch scheduler for name %s, %v", *app.Spec.BatchScheduler, err)
 		return false, nil
 	}
 	return scheduler.ShouldSchedule(app), scheduler
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ import ( @@
     )
     const (
-    	PodGroupName = "podgroups.scheduling.sigs.dev"
+    	PodGroupName = "podgroups.scheduling.volcano.sh"
     )
     type VolcanoBatchScheduler struct {
@@ Expand Down @@