github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115797 from pohly/dra-test-driver-resource-limit-fix

Browse Source 
e2e dra: fix resource limits in a mixed cluster
This commit is contained in:
Kubernetes Prow Robot 2023-02-15 09:58:33 -08:00 committed by GitHub
commit fa3d5730a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/dra/test-driver/app/controller.go
View File

@ -198,8 +198,9 @@ func (c *ExampleController) allocate(ctx context.Context, claim *resourcev1alpha
// number of allocations (even spreading) or the most (packing). // number of allocations (even spreading) or the most (packing).
node = viableNodes[rand.Intn(len(viableNodes))] node = viableNodes[rand.Intn(len(viableNodes))]
logger.Info("picked a node ourselves", "selectedNode", selectedNode) logger.Info("picked a node ourselves", "selectedNode", selectedNode)
} else if c.resources.MaxAllocations > 0 && } else if !contains(c.resources.Nodes, node) ||
c.countAllocations(node) >= c.resources.MaxAllocations { c.resources.MaxAllocations > 0 &&
c.countAllocations(node) >= c.resources.MaxAllocations {
return nil, fmt.Errorf("resources exhausted on node %q", node) return nil, fmt.Errorf("resources exhausted on node %q", node)
} }
} else { } else {
@ -292,7 +293,7 @@ func (c *ExampleController) UnsuitableNodes(ctx context.Context, pod *v1.Pod, cl
// can only work if a node has capacity left // can only work if a node has capacity left
// for all of them. Also, nodes that the driver // for all of them. Also, nodes that the driver
// doesn't run on cannot be used. // doesn't run on cannot be used.
if contains(c.resources.Nodes, node) && if !contains(c.resources.Nodes, node) ||
allocationsPerNode[node]+len(claims) > c.resources.MaxAllocations { allocationsPerNode[node]+len(claims) > c.resources.MaxAllocations {
claim.UnsuitableNodes = append(claim.UnsuitableNodes, node) claim.UnsuitableNodes = append(claim.UnsuitableNodes, node)
} }
@ -305,7 +306,7 @@ func (c *ExampleController) UnsuitableNodes(ctx context.Context, pod *v1.Pod, cl
for _, claim := range claims { for _, claim := range claims {
claim.UnsuitableNodes = nil claim.UnsuitableNodes = nil
for _, node := range potentialNodes { for _, node := range potentialNodes {
if contains(c.resources.Nodes, node) && if !contains(c.resources.Nodes, node) ||
allocations+len(claims) > c.resources.MaxAllocations { allocations+len(claims) > c.resources.MaxAllocations {
claim.UnsuitableNodes = append(claim.UnsuitableNodes, node) claim.UnsuitableNodes = append(claim.UnsuitableNodes, node)
} }