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

e2e dra: fix resource limits in a mixed cluster

Browse Source 
The check for "resources available on a node" must treat nodes that are not
listed as "no resources available". The previous logic only worked because all
nodes were listed during E2E testing. The upcoming integration testing is
covering additional scenarios and triggered this broken case.
This commit is contained in:
Patrick Ohly 2023-01-25 19:50:06 +01:00
parent 98406e2a3e
commit 20d7fa2771
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)
} }