add preemptBasedOnFlavorOrder knob

kubernetes-sigs · Apr 27, 2023 · 2d998f4 · 2d998f4
1 parent 9ca57c8
commit 2d998f4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/apis/kueue/v1beta1/clusterqueue_types.go b/apis/kueue/v1beta1/clusterqueue_types.go
@@ -272,6 +272,9 @@ type ClusterQueuePreemption struct {
 	// +kubebuilder:default=Never
 	// +kubebuilder:validation:Enum=Never;LowerPriority
 	WithinClusterQueue PreemptionPolicy `json:"withinClusterQueue,omitempty"`
+
+	// +kubebuilder:default="flase"
+	PreemptBasedOnFlavorOrder bool `json:"preemptBasedOnFlavorOrder"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/components/crd/bases/kueue.x-k8s.io_clusterqueues.yaml b/config/components/crd/bases/kueue.x-k8s.io_clusterqueues.yaml
@@ -129,6 +129,9 @@ spec:
                   of Workloads to preempt to accomomdate the pending Workload, preempting
                   Workloads with lower priority first."
                 properties:
+                  preemptBasedOnFlavorOrder:
+                    default: flase
+                    type: boolean
                   reclaimWithinCohort:
                     default: Never
                     description: "reclaimWithinCohort determines whether a pending
@@ -159,6 +162,8 @@ spec:
                     - Never
                     - LowerPriority
                     type: string
+                required:
+                - preemptBasedOnFlavorOrder
                 type: object
               queueingStrategy:
                 default: BestEffortFIFO

diff --git a/pkg/scheduler/flavorassigner/flavorassigner.go b/pkg/scheduler/flavorassigner/flavorassigner.go
@@ -368,6 +368,9 @@ func (a *Assignment) findFlavorForResourceGroup(
 			}
 		}
 
+		if cq.Preemption.PreemptBasedOnFlavorOrder && representativeMode == Preempt {
+			return assignments, status
+		}
 		if representativeMode > bestAssignmentMode {
 			bestAssignment = assignments
 			bestAssignmentMode = representativeMode