Update JobSpec to support queue

pkg/apis/batch/v1alpha1/job.go

@@ -60,6 +60,9 @@ type JobSpec struct {
 	// Specifies the default lifecycle of tasks
 	// +optional
 	Policies []LifecyclePolicy `json:"policies,omitempty" protobuf:"bytes,6,opt,name=policies"`
+
+	//Specifies the queue that will be used in the scheduler, "default" queue is used this leaves empty.
+	Queue string `json:"queue,omitempty" protobuf:"bytes,7,opt,name=queue"`
 }
 
 // VolumeSpec defines the specification of Volume, e.g. PVC

pkg/apis/batch/v1alpha1/labels.go

@@ -22,5 +22,4 @@ const (
 	JobNamespaceKey = "volcano.sh/job-namespace"
 	DefaultTaskSpec = "default"
 	JobVersion      = "volcano.sh/job-version"
-	QueueNameKey    = "volcano.sh/queue-name"
 )

pkg/controllers/job/job_controller_actions.go

@@ -450,14 +450,10 @@ func (cc *Controller) createPodGroupIfNotExist(job *vkv1.Job) error {
 			},
 			Spec: kbv1.PodGroupSpec{
 				MinMember: job.Spec.MinAvailable,
+				Queue:     job.Spec.Queue,
 			},
 		}
 
-		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)

pkg/controllers/job/job_controller_util.go

@@ -198,12 +198,3 @@ 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 ""
-}

test/e2e/util.go

@@ -317,10 +317,10 @@ 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,
+			Queue:    jobSpec.queue,
 		},
 	}