Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Replace Requests with PodGroupRequests #4435

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+119 −116
Open

chore: Replace Requests with PodGroupRequests #4435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
TotalRequests: []workload.PodSetResources{
{
Name: kueue.DefaultPodSetName,
Requests: resources.Requests{corev1.ResourceCPU: 5000},
Requests: resources.PodGroupRequests{corev1.ResourceCPU: 5000},
Count: 1,
Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{corev1.ResourceCPU: "default"},
},
Expand Down Expand Up @@ -897,7 +897,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
TotalRequests: []workload.PodSetResources{
{
Name: kueue.DefaultPodSetName,
Requests: resources.Requests{corev1.ResourceCPU: 1000},
Requests: resources.PodGroupRequests{corev1.ResourceCPU: 1000},
Count: 1,
Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
corev1.ResourceCPU: "f1",
Expand All @@ -910,7 +910,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
TotalRequests: []workload.PodSetResources{
{
Name: kueue.DefaultPodSetName,
Requests: resources.Requests{corev1.ResourceCPU: 1000},
Requests: resources.PodGroupRequests{corev1.ResourceCPU: 1000},
Count: 1,
Flavors: map[corev1.ResourceName]kueue.ResourceFlavorReference{
corev1.ResourceCPU: "f1",
Expand Down
72 changes: 36 additions & 36 deletions pkg/cache/tas_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func TestFindTopologyAssignment(t *testing.T) {
nodeLabels map[string]string
nodes []corev1.Node
pods []corev1.Pod
requests resources.Requests
requests resources.PodGroupRequests
count int32
tolerations []corev1.Toleration
wantAssignment *kueue.TopologyAssignment
Expand Down Expand Up @@ -315,7 +315,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -356,7 +356,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -439,7 +439,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -462,7 +462,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -486,7 +486,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -510,7 +510,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 3,
Expand All @@ -534,7 +534,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 3,
Expand Down Expand Up @@ -583,7 +583,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Preferred: ptr.To(tasBlockLabel),
},
levels: []string{tasBlockLabel},
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 5,
Expand Down Expand Up @@ -612,7 +612,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 2,
Expand All @@ -636,7 +636,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand All @@ -650,7 +650,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -677,7 +677,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -704,7 +704,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -738,7 +738,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -769,7 +769,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 4000,
},
count: 1,
Expand All @@ -782,7 +782,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 5,
Expand All @@ -796,7 +796,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceMemory: 1024,
},
count: 4,
Expand All @@ -820,7 +820,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Preferred: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 4,
Expand Down Expand Up @@ -851,7 +851,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Preferred: ptr.To(tasRackLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 6,
Expand Down Expand Up @@ -889,7 +889,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Preferred: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 6,
Expand Down Expand Up @@ -927,7 +927,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Preferred: ptr.To(tasBlockLabel),
},
levels: defaultTwoLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 10,
Expand All @@ -953,7 +953,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-b",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand All @@ -980,7 +980,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1015,7 +1015,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(tasRackLabel),
},
levels: defaultThreeLevels,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1044,7 +1044,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 600,
},
count: 1,
Expand Down Expand Up @@ -1087,7 +1087,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 600,
},
count: 1,
Expand Down Expand Up @@ -1127,7 +1127,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 600,
},
count: 1,
Expand Down Expand Up @@ -1157,7 +1157,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 600,
},
count: 1,
Expand Down Expand Up @@ -1196,7 +1196,7 @@ func TestFindTopologyAssignment(t *testing.T) {
Required: ptr.To(corev1.LabelHostname),
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 600,
},
count: 1,
Expand Down Expand Up @@ -1237,7 +1237,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1265,7 +1265,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1297,7 +1297,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1336,7 +1336,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 1000,
},
count: 1,
Expand Down Expand Up @@ -1379,7 +1379,7 @@ func TestFindTopologyAssignment(t *testing.T) {
"zone": "zone-a",
},
levels: defaultOneLevel,
requests: resources.Requests{
requests: resources.PodGroupRequests{
corev1.ResourceCPU: 300,
},
count: 1,
Expand Down
12 changes: 6 additions & 6 deletions pkg/cache/tas_flavor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ type TASFlavorCache struct {
Tolerations []corev1.Toleration

// usage maintains the usage per topology domain
usage map[utiltas.TopologyDomainID]resources.Requests
usage map[utiltas.TopologyDomainID]resources.PodGroupRequests
}

func (t *TASCache) NewTASFlavorCache(topologyName kueue.TopologyReference, levels []string, nodeLabels map[string]string,
Expand All @@ -80,7 +80,7 @@ func (t *TASCache) NewTASFlavorCache(topologyName kueue.TopologyReference, level
Levels: slices.Clone(levels),
NodeLabels: maps.Clone(nodeLabels),
Tolerations: slices.Clone(tolerations),
usage: make(map[utiltas.TopologyDomainID]resources.Requests),
usage: make(map[utiltas.TopologyDomainID]resources.PodGroupRequests),
}
}

Expand Down Expand Up @@ -137,7 +137,7 @@ func (c *TASFlavorCache) snapshotForNodes(log logr.Logger, nodes []corev1.Node,
}
if domainID, ok := nodeToDomain[pod.Spec.NodeName]; ok {
requests := resourcehelpers.PodRequests(&pod, resourcehelpers.PodResourcesOptions{})
usage := resources.NewRequests(requests)
usage := resources.NewPodGroupRequests(requests)
snapshot.addNonTASUsage(domainID, usage)
}
}
Expand All @@ -159,14 +159,14 @@ func (c *TASFlavorCache) updateUsage(topologyRequests []workload.TopologyDomainR
domainID := utiltas.DomainID(tr.Values)
_, found := c.usage[domainID]
if !found {
c.usage[domainID] = resources.Requests{}
c.usage[domainID] = resources.PodGroupRequests{}
}
if op == subtract {
c.usage[domainID].Sub(tr.TotalRequests())
c.usage[domainID].Sub(resources.Requests{corev1.ResourcePods: int64(tr.Count)})
c.usage[domainID].Sub(resources.PodGroupRequests{corev1.ResourcePods: int64(tr.Count)})
} else {
c.usage[domainID].Add(tr.TotalRequests())
c.usage[domainID].Add(resources.Requests{corev1.ResourcePods: int64(tr.Count)})
c.usage[domainID].Add(resources.PodGroupRequests{corev1.ResourcePods: int64(tr.Count)})
}
}
}
Loading