pdb-queue renamed to default-queue; apply to PodGroup

Author: adam-marek

pkg/scheduler/api/job_info.go

@@ -160,10 +160,17 @@ func (ji *JobInfo) SetPodGroup(pg *arbcorev1.PodGroup) {
 	ji.Namespace = pg.Namespace
 	ji.MinAvailable = pg.Spec.MinMember
 
-	if len(pg.Spec.Queue) == 0 {
-		ji.Queue = QueueID(pg.Namespace)
-	} else {
+	//set queue name based on the available information
+	//in the following priority order:
+	// 1. queue name from PodGroup spec (if available)
+	// 2. queue name from default-queue command line option (if specified)
+	// 3. namespace name
+	if len(pg.Spec.Queue) > 0 {
 		ji.Queue = QueueID(pg.Spec.Queue)
+	} else if len(options.Options().DefaultQueue) > 0 {
+		ji.Queue = QueueID(options.Options().DefaultQueue)
+	} else {
+		ji.Queue = QueueID(pg.Namespace)
 	}
 
 	ji.CreationTimestamp = pg.GetCreationTimestamp()
@@ -174,10 +181,10 @@ func (ji *JobInfo) SetPDB(pdb *policyv1.PodDisruptionBudget) {
 	ji.Name = pdb.Name
 	ji.MinAvailable = pdb.Spec.MinAvailable.IntVal
 	ji.Namespace = pdb.Namespace
-	if len(options.Options().PdbQueue) == 0 {
+	if len(options.Options().DefaultQueue) == 0 {
 		ji.Queue = QueueID(pdb.Namespace)
 	} else {
-		ji.Queue = QueueID(options.Options().PdbQueue)
+		ji.Queue = QueueID(options.Options().DefaultQueue)
 	}
 
 	ji.CreationTimestamp = pdb.GetCreationTimestamp()