upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-03 13:47:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #138885 from takonomura/fix-dra-all-consumed-counters

Browse source 
DRA: fix AllocationModeAll with consumed counters
This commit is contained in:
Kubernetes Prow Robot 2026-05-11 19:49:51 +05:30 committed by GitHub
commit cc82d8b02a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
staging/src/k8s.io/dynamic-resource-allocation/structured/internal/allocatortesting/allocator_testing.go
View file

@ -1233,6 +1233,43 @@ func TestAllocator(t *testing.T,
deviceAllocationResult(req0, driverA, pool1, device1, false),
)},
},
"all-devices-with-consumed-counters": {
features: Features{
PartitionableDevices: true,
},
claimsToAllocate: objects(claimWithRequests(claim0, nil, resourceapi.DeviceRequest{
Name: req0,
Exactly: &resourceapi.ExactDeviceRequest{
AllocationMode: resourceapi.DeviceAllocationModeAll,
DeviceClassName: classA,
},
})),
classes: objects(class(classA, driverA)),
slices: unwrapResourceSlices(
sliceWithDevices(slice1, node1, resourcePool(pool1, 2), driverA,
device(device1, nil, nil).withDeviceCounterConsumption(
deviceCounterConsumption(counterSet1,
map[string]resource.Quantity{
"memory": resource.MustParse("4Gi"),
},
),
),
),
sliceWithCounterSets(slice2, node1, resourcePool(pool1, 2), driverA,
counterSet(counterSet1,
map[string]resource.Quantity{
"memory": resource.MustParse("8Gi"),
},
),
),
),
node: node(node1, region1),
expectResults: []any{allocationResult(
localNodeSelector(node1),
deviceAllocationResult(req0, driverA, pool1, device1, false),
)},
},
"all-devices-many": {
claimsToAllocate: objects(claimWithRequests(claim0, nil, resourceapi.DeviceRequest{
Name: req0,

1
staging/src/k8s.io/dynamic-resource-allocation/structured/internal/experimental/allocator_experimental.go
View file

@ -568,6 +568,7 @@ func (alloc *allocator) validateDeviceRequest(request requestAccessor, parentReq
id: DeviceID{Driver: slice.Spec.Driver, Pool: slice.Spec.Pool.Name, Device: slice.Spec.Devices[deviceIndex].Name},
Device: &slice.Spec.Devices[deviceIndex],
slice: slice,
pool: pool,
}
if alloc.features.ConsumableCapacity {
// Next validate whether resource request over capacity

1
staging/src/k8s.io/dynamic-resource-allocation/structured/internal/incubating/allocator_incubating.go
View file

@ -565,6 +565,7 @@ func (alloc *allocator) validateDeviceRequest(request requestAccessor, parentReq
id: DeviceID{Driver: slice.Spec.Driver, Pool: slice.Spec.Pool.Name, Device: slice.Spec.Devices[deviceIndex].Name},
Device: &slice.Spec.Devices[deviceIndex],
slice: slice,
pool: pool,
}
if alloc.features.ConsumableCapacity {
// Next validate whether resource request over capacity

1
staging/src/k8s.io/dynamic-resource-allocation/structured/internal/stable/allocator_stable.go
View file

@ -471,6 +471,7 @@ func (alloc *allocator) validateDeviceRequest(request requestAccessor, parentReq
id: DeviceID{Driver: slice.Spec.Driver, Pool: slice.Spec.Pool.Name, Device: slice.Spec.Devices[deviceIndex].Name},
Device: &slice.Spec.Devices[deviceIndex],
slice: slice,
pool: pool,
}
requestData.allDevices = append(requestData.allDevices, device)
}