Skip to content

Commit f06d24a

Browse files
pohlyk8s-publishing-bot
authored andcommitted
dra api: NodeResourceModel -> ResourceModel
When renaming NodeResourceSlice to ResourceSlice, the embedded [Node]ResourceModel also should have been renamed. Kubernetes-commit: a0add8d2c7578cd9f94fc302d6212f9f7d16175b
1 parent b048bd8 commit f06d24a

File tree

6 files changed

+389
-389
lines changed

6 files changed

+389
-389
lines changed

resource/v1alpha2/generated.pb.go

+344-344
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resource/v1alpha2/generated.proto

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resource/v1alpha2/namedresources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"k8s.io/apimachinery/pkg/api/resource"
2121
)
2222

23-
// NamedResourcesResources is used in NodeResourceModel.
23+
// NamedResourcesResources is used in ResourceModel.
2424
type NamedResourcesResources struct {
2525
// The list of all individual resources instances currently available.
2626
//

resource/v1alpha2/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -554,11 +554,11 @@ type ResourceSlice struct {
554554
// objects with a certain driver name.
555555
DriverName string `json:"driverName" protobuf:"bytes,3,name=driverName"`
556556

557-
NodeResourceModel `json:",inline" protobuf:"bytes,4,name=nodeResourceModel"`
557+
ResourceModel `json:",inline" protobuf:"bytes,4,name=resourceModel"`
558558
}
559559

560-
// NodeResourceModel must have one and only one field set.
561-
type NodeResourceModel struct {
560+
// ResourceModel must have one and only one field set.
561+
type ResourceModel struct {
562562
// NamedResources describes available resources using the named resources model.
563563
//
564564
// +optional

resource/v1alpha2/types_swagger_doc_generated.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,6 @@ func (DriverRequests) SwaggerDoc() map[string]string {
6767
return map_DriverRequests
6868
}
6969

70-
var map_NodeResourceModel = map[string]string{
71-
"": "NodeResourceModel must have one and only one field set.",
72-
"namedResources": "NamedResources describes available resources using the named resources model.",
73-
}
74-
75-
func (NodeResourceModel) SwaggerDoc() map[string]string {
76-
return map_NodeResourceModel
77-
}
78-
7970
var map_PodSchedulingContext = map[string]string{
8071
"": "PodSchedulingContext objects hold information that is needed to schedule a Pod with ResourceClaims that use \"WaitForFirstConsumer\" allocation mode.\n\nThis is an alpha type and requires enabling the DynamicResourceAllocation feature gate.",
8172
"metadata": "Standard object metadata",
@@ -331,6 +322,15 @@ func (ResourceHandle) SwaggerDoc() map[string]string {
331322
return map_ResourceHandle
332323
}
333324

325+
var map_ResourceModel = map[string]string{
326+
"": "ResourceModel must have one and only one field set.",
327+
"namedResources": "NamedResources describes available resources using the named resources model.",
328+
}
329+
330+
func (ResourceModel) SwaggerDoc() map[string]string {
331+
return map_ResourceModel
332+
}
333+
334334
var map_ResourceRequest = map[string]string{
335335
"": "ResourceRequest is a request for resources from one particular driver.",
336336
"vendorParameters": "VendorParameters are arbitrary setup parameters for the requested resource. They are ignored while allocating a claim.",

resource/v1alpha2/zz_generated.deepcopy.go

+22-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)