Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set podgroup to stable version #891

Merged
merged 2 commits into from
Apr 28, 2020
Merged

Set podgroup to stable version #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b7dce
Set podgroup to stable version
ggaaooppeenngg Apr 27, 2020
0f6f254
Update operator rbac
ggaaooppeenngg Apr 27, 2020
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
3 changes: 3 additions & 0 deletions manifest/spark-operator-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/batchscheduler/volcano/volcano_scheduler.go
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion pkg/controller/sparkapplication/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down