move FlavorResourceQuantities to cache

remove Preemption setting in MakeClusterQueue
kubernetes-sigs · Oct 7, 2023 · 50475bd · 50475bd
1 parent 4cdc10f
commit 50475bd
Show file tree

Hide file tree

Showing 14 changed files with 275 additions and 208 deletions.
diff --git a/keps/582-preempt-based-on-flavor-order/README.md b/keps/582-preempt-based-on-flavor-order/README.md
@@ -246,21 +246,21 @@ func assignFlavors(log logr.Logger, requests []workload.PodSetResources, podSets
 	var assignment Assignment
 	if lastAssignment != nil {
 		assignment = Assignment{
-			TotalBorrow: make(workload.FlavorResourceQuantities),
+			TotalBorrow: make(cache.FlavorResourceQuantities),
 			PodSets:     make([]PodSetAssignment, 0, len(requests)),
 			LastState:   *lastAssignment,
-			Usage:       make(workload.FlavorResourceQuantities),
+			Usage:       make(cache.FlavorResourceQuantities),
 		}
 	} else {
 		assignment = Assignment{
-			TotalBorrow: make(workload.FlavorResourceQuantities),
+			TotalBorrow: make(cache.FlavorResourceQuantities),
 			PodSets:     make([]PodSetAssignment, 0, len(requests)),
 			LastState: workload.AssigmentClusterQueueState{
 				LastAssignedFlavorIdx:  make([]map[corev1.ResourceName]int, 0, len(podSets)),
 				CohortGeneration:       0,
 				ClusterQueueGeneration: cq.Generation,
 			},
-			Usage: make(workload.FlavorResourceQuantities),
+			Usage: make(cache.FlavorResourceQuantities),
 		}
 		if cq.Cohort != nil {
 			assignment.LastState.CohortGeneration = cq.Cohort.Generation

diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -312,7 +312,7 @@ func (c *Cache) AddClusterQueue(ctx context.Context, cq *kueue.ClusterQueue) err
 		qImpl := &queue{
 			key:               qKey,
 			admittedWorkloads: 0,
-			usage:             make(workload.FlavorResourceQuantities),
+			usage:             make(FlavorResourceQuantities),
 		}
 		if err = qImpl.resetFlavorsAndResources(cqImpl.Usage); err != nil {
 			return err