Merge pull request volcano-sh#12 from k82cn/job_sched_name

kevin-wangzefeng · Jan 27, 2019 · 0413ac4 · 0413ac4
2 parents c46351a + 3cfe9ce
commit 0413ac4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/example/job.yaml b/example/job.yaml
@@ -4,6 +4,7 @@ metadata:
   name: test-job
 spec:
   minAvailable: 3
+  schedulerName: kube-batch
   policies:
   - event: PodEvicted
     action: RestartJob
@@ -31,4 +32,3 @@ spec:
             requests:
               cpu: "1"
         restartPolicy: OnFailure
-        schedulerName: kube-batch
diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go
@@ -71,6 +71,11 @@ func createJobPod(job *vkv1.Job, template *v1.PodTemplateSpec, ix int) *v1.Pod {
 		Spec: templateCopy.Spec,
 	}
 
+	// If no scheduler name in Pod, use scheduler name from Job.
+	if len(pod.Spec.SchedulerName) == 0 {
+		pod.Spec.SchedulerName = job.Spec.SchedulerName
+	}
+
 	if job.Spec.Output != nil {
 		if job.Spec.Output.VolumeClaim == nil {
 			volume := v1.Volume{