Skip to content

Commit

Permalink
dra api: NodeResourceModel -> ResourceModel
Browse files Browse the repository at this point in the history
When renaming NodeResourceSlice to ResourceSlice, the embedded
[Node]ResourceModel also should have been renamed.

Kubernetes-commit: a0add8d2c7578cd9f94fc302d6212f9f7d16175b
  • Loading branch information
pohly authored and k8s-publishing-bot committed Mar 14, 2024
1 parent b048bd8 commit f06d24a
Show file tree
Hide file tree
Showing 6 changed files with 389 additions and 389 deletions.
688 changes: 344 additions & 344 deletions resource/v1alpha2/generated.pb.go

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions resource/v1alpha2/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resource/v1alpha2/namedresources.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
)

// NamedResourcesResources is used in NodeResourceModel.
// NamedResourcesResources is used in ResourceModel.
type NamedResourcesResources struct {
// The list of all individual resources instances currently available.
//
Expand Down
6 changes: 3 additions & 3 deletions resource/v1alpha2/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -554,11 +554,11 @@ type ResourceSlice struct {
// objects with a certain driver name.
DriverName string `json:"driverName" protobuf:"bytes,3,name=driverName"`

NodeResourceModel `json:",inline" protobuf:"bytes,4,name=nodeResourceModel"`
ResourceModel `json:",inline" protobuf:"bytes,4,name=resourceModel"`
}

// NodeResourceModel must have one and only one field set.
type NodeResourceModel struct {
// ResourceModel must have one and only one field set.
type ResourceModel struct {
// NamedResources describes available resources using the named resources model.
//
// +optional
Expand Down
18 changes: 9 additions & 9 deletions resource/v1alpha2/types_swagger_doc_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,6 @@ func (DriverRequests) SwaggerDoc() map[string]string {
return map_DriverRequests
}

var map_NodeResourceModel = map[string]string{
"": "NodeResourceModel must have one and only one field set.",
"namedResources": "NamedResources describes available resources using the named resources model.",
}

func (NodeResourceModel) SwaggerDoc() map[string]string {
return map_NodeResourceModel
}

var map_PodSchedulingContext = map[string]string{
"": "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.",
"metadata": "Standard object metadata",
Expand Down Expand Up @@ -331,6 +322,15 @@ func (ResourceHandle) SwaggerDoc() map[string]string {
return map_ResourceHandle
}

var map_ResourceModel = map[string]string{
"": "ResourceModel must have one and only one field set.",
"namedResources": "NamedResources describes available resources using the named resources model.",
}

func (ResourceModel) SwaggerDoc() map[string]string {
return map_ResourceModel
}

var map_ResourceRequest = map[string]string{
"": "ResourceRequest is a request for resources from one particular driver.",
"vendorParameters": "VendorParameters are arbitrary setup parameters for the requested resource. They are ignored while allocating a claim.",
Expand Down
44 changes: 22 additions & 22 deletions resource/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f06d24a

Please sign in to comment.