Add queue name support in job

volcano-sh · Mar 22, 2019 · d88aca1 · d88aca1
1 parent 2403639
commit d88aca1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/pkg/apis/batch/v1alpha1/labels.go b/pkg/apis/batch/v1alpha1/labels.go
@@ -22,4 +22,5 @@ const (
 	JobNamespaceKey = "volcano.sh/job-namespace"
 	DefaultTaskSpec = "default"
 	JobVersion      = "volcano.sh/job-version"
+	QueueNameKey    = "volcano.sh/queue-name"
 )
diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go
@@ -453,6 +453,11 @@ func (cc *Controller) createPodGroupIfNotExist(job *vkv1.Job) error {
 			},
 		}
 
+		queue := GetJobQueueName(job)
+		if queue != "" {
+			pg.Spec.Queue = queue
+		}
+
 		if _, e := cc.kbClients.SchedulingV1alpha1().PodGroups(job.Namespace).Create(pg); e != nil {
 			glog.V(3).Infof("Failed to create PodGroup for Job <%s/%s>: %v",
 				job.Namespace, job.Name, err)

diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go
@@ -198,3 +198,12 @@ func applyPolicies(job *vkv1.Job, req *apis.Request) vkv1.Action {
 
 	return vkv1.SyncJobAction
 }
+
+func GetJobQueueName(job *vkv1.Job) string {
+	for key, value := range job.Labels {
+		if key == vkv1.QueueNameKey {
+			return value
+		}
+	}
+	return ""
+}
diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -317,6 +317,7 @@ func createJob(context *context, jobSpec *jobSpec) *vkv1.Job {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      jobSpec.name,
 			Namespace: ns,
+			Labels:    map[string]string{vkv1.QueueNameKey: jobSpec.queue},
 		},
 		Spec: vkv1.JobSpec{
 			Policies: jobSpec.policies,