scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

dra api: NodeResourceModel -> ResourceModel

Browse Source 
When renaming NodeResourceSlice to ResourceSlice, the embedded
[Node]ResourceModel also should have been renamed.
This commit is contained in:
Patrick Ohly
2024-03-14 14:08:17 +01:00
parent 3ec6a38795
commit a0add8d2c7
26 changed files with 552 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/dra/dra.go
View File

@@ -911,7 +911,7 @@ var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation,
"ObjectMeta": gstruct.Ignore(), // TODO (https://github.com/kubernetes/kubernetes/issues/123692): validate ownerref
"NodeName": gomega.Equal(nodeName),
"DriverName": gomega.Equal(driver.Name),
"NodeResourceModel": gomega.Equal(resourcev1alpha2.NodeResourceModel{NamedResources: &resourcev1alpha2.NamedResourcesResources{
"ResourceModel": gomega.Equal(resourcev1alpha2.ResourceModel{NamedResources: &resourcev1alpha2.NamedResourcesResources{
Instances: []resourcev1alpha2.NamedResourcesInstance{{Name: "instance-0"}},
}}),
}),

2
test/e2e/dra/test-driver/app/kubeletplugin.go
View File

@@ -354,7 +354,7 @@ func (ex *ExamplePlugin) NodeListAndWatchResources(req *drapbv1alpha3.NodeListAn
instances[i].Name = fmt.Sprintf("instance-%d", i)
}
resp := &drapbv1alpha3.NodeListAndWatchResourcesResponse{
Resources: []*resourceapi.NodeResourceModel{
Resources: []*resourceapi.ResourceModel{
{
NamedResources: &resourceapi.NamedResourcesResources{
Instances: instances,

4
test/integration/scheduler_perf/dra.go
View File

@@ -237,13 +237,13 @@ func resourceSlice(driverName, nodeName string, capacity int) *resourcev1alpha2.
NodeName: nodeName,
DriverName: driverName,
NodeResourceModel: resourcev1alpha2.NodeResourceModel{
ResourceModel: resourcev1alpha2.ResourceModel{
NamedResources: &resourcev1alpha2.NamedResourcesResources{},
},
}
for i := 0; i < capacity; i++ {
slice.NodeResourceModel.NamedResources.Instances = append(slice.NodeResourceModel.NamedResources.Instances,
slice.ResourceModel.NamedResources.Instances = append(slice.ResourceModel.NamedResources.Instances,
resourcev1alpha2.NamedResourcesInstance{
Name: fmt.Sprintf("instance-%d", i),
},