Merge pull request #269 from asifdxtreme/master

Bump Volcano-sh/Scheduler
volcano-sh · Jul 1, 2019 · 3ce9a16 · 3ce9a16
2 parents 75674f3 + 35f0312
commit 3ce9a16
Show file tree

Hide file tree

Showing 26 changed files with 832 additions and 211 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/controllers/job/job_controller_handler_test.go b/pkg/controllers/job/job_controller_handler_test.go
@@ -183,7 +183,7 @@ func TestUpdateJobFunc(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: vkbatchv1.JobSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					MinAvailable:  5,
 				},
 				Status: vkbatchv1.JobStatus{
@@ -198,7 +198,7 @@ func TestUpdateJobFunc(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: vkbatchv1.JobSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					MinAvailable:  5,
 				},
 				Status: vkbatchv1.JobStatus{
@@ -216,7 +216,7 @@ func TestUpdateJobFunc(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: vkbatchv1.JobSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					MinAvailable:  5,
 				},
 				Status: vkbatchv1.JobStatus{
@@ -231,7 +231,7 @@ func TestUpdateJobFunc(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: vkbatchv1.JobSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					MinAvailable:  5,
 				},
 				Status: vkbatchv1.JobStatus{

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -338,7 +338,7 @@ func createJobInner(context *context, jobSpec *jobSpec) (*vkv1.Job, error) {
 					Labels: task.labels,
 				},
 				Spec: v1.PodSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					RestartPolicy: restartPolicy,
 					Containers:    createContainers(task.img, task.command, task.workingDir, task.req, task.limit, task.hostport),
 					Affinity:      task.affinity,

diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options/options.go b/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options/options.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go b/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/allocate/allocate.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/allocate/allocate.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/backfill/backfill.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/backfill/backfill.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/preempt/preempt.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/preempt/preempt.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/reclaim/reclaim.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/reclaim/reclaim.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/job_info.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/job_info.go
diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/node_info.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/node_info.go