dra api: rename NodeResourceSlice -> ResourceSlice

While currently those objects only get published by the kubelet for node-local
resources, this could change once we also support network-attached
resources. Dropping the "Node" prefix enables such a future extension.

The NodeName in ResourceSlice and StructuredResourceHandle then becomes
optional. The kubelet still needs to provide one and it must match its own node
name, otherwise it doesn't have permission to access ResourceSlice objects.

Kubernetes-commit: 0b6a0d686a060b5d5ff92cea931aacd4eba85adb

Author: pohly

resource/v1alpha2/generated.pb.go

@@ -52,8 +52,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ResourceClaimTemplateList{},
 		&PodSchedulingContext{},
 		&PodSchedulingContextList{},
-		&NodeResourceSlice{},
-		&NodeResourceSliceList{},
+		&ResourceSlice{},
+		&ResourceSliceList{},
 		&ResourceClaimParameters{},
 		&ResourceClaimParametersList{},
 		&ResourceClassParameters{},

resource/v1alpha2/generated.proto

@@ -224,8 +224,11 @@ type StructuredResourceHandle struct {
 	// +optional
 	VendorClaimParameters runtime.RawExtension `json:"vendorClaimParameters,omitempty" protobuf:"bytes,2,opt,name=vendorClaimParameters"`
 
-	// NodeName is the name of the node providing the necessary resources.
-	NodeName string `json:"nodeName" protobuf:"bytes,4,name=nodeName"`
+	// NodeName is the name of the node providing the necessary resources
+	// if the resources are local to a node.
+	//
+	// +optional
+	NodeName string `json:"nodeName,omitempty" protobuf:"bytes,4,name=nodeName"`
 
 	// Results lists all allocated driver resources.
 	//
@@ -529,21 +532,25 @@ type ResourceClaimTemplateList struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:prerelease-lifecycle-gen:introduced=1.30
 
-// NodeResourceSlice provides information about available
+// ResourceSlice provides information about available
 // resources on individual nodes.
-type NodeResourceSlice struct {
+type ResourceSlice struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard object metadata
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
-	// NodeName identifies the node where the capacity is available.
-	// A field selector can be used to list only NodeResourceSlice
+	// NodeName identifies the node which provides the resources
+	// if they are local to a node.
+	//
+	// A field selector can be used to list only ResourceSlice
 	// objects with a certain node name.
-	NodeName string `json:"nodeName" protobuf:"bytes,2,name=nodeName"`
+	//
+	// +optional
+	NodeName string `json:"nodeName,omitempty" protobuf:"bytes,2,opt,name=nodeName"`
 
 	// DriverName identifies the DRA driver providing the capacity information.
-	// A field selector can be used to list only NodeResourceSlice
+	// A field selector can be used to list only ResourceSlice
 	// objects with a certain driver name.
 	DriverName string `json:"driverName" protobuf:"bytes,3,name=driverName"`
 
@@ -561,15 +568,15 @@ type NodeResourceModel struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:prerelease-lifecycle-gen:introduced=1.30
 
-// NodeResourceSliceList is a collection of NodeResourceSlices.
-type NodeResourceSliceList struct {
+// ResourceSliceList is a collection of ResourceSlices.
+type ResourceSliceList struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard list metadata
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is the list of node resource capacity objects.
-	Items []NodeResourceSlice `json:"items" protobuf:"bytes,2,rep,name=items"`
+	Items []ResourceSlice `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
 
 // +genclient

resource/v1alpha2/register.go

@@ -76,27 +76,6 @@ func (NodeResourceModel) SwaggerDoc() map[string]string {
 	return map_NodeResourceModel
 }
 
-var map_NodeResourceSlice = map[string]string{
-	"":           "NodeResourceSlice provides information about available resources on individual nodes.",
-	"metadata":   "Standard object metadata",
-	"nodeName":   "NodeName identifies the node where the capacity is available. A field selector can be used to list only NodeResourceSlice objects with a certain node name.",
-	"driverName": "DriverName identifies the DRA driver providing the capacity information. A field selector can be used to list only NodeResourceSlice objects with a certain driver name.",
-}
-
-func (NodeResourceSlice) SwaggerDoc() map[string]string {
-	return map_NodeResourceSlice
-}
-
-var map_NodeResourceSliceList = map[string]string{
-	"":         "NodeResourceSliceList is a collection of NodeResourceSlices.",
-	"metadata": "Standard list metadata",
-	"items":    "Items is the list of node resource capacity objects.",
-}
-
-func (NodeResourceSliceList) SwaggerDoc() map[string]string {
-	return map_NodeResourceSliceList
-}
-
 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",
@@ -370,11 +349,32 @@ func (ResourceRequestModel) SwaggerDoc() map[string]string {
 	return map_ResourceRequestModel
 }
 
+var map_ResourceSlice = map[string]string{
+	"":           "ResourceSlice provides information about available resources on individual nodes.",
+	"metadata":   "Standard object metadata",
+	"nodeName":   "NodeName identifies the node which provides the resources if they are local to a node.\n\nA field selector can be used to list only ResourceSlice objects with a certain node name.",
+	"driverName": "DriverName identifies the DRA driver providing the capacity information. A field selector can be used to list only ResourceSlice objects with a certain driver name.",
+}
+
+func (ResourceSlice) SwaggerDoc() map[string]string {
+	return map_ResourceSlice
+}
+
+var map_ResourceSliceList = map[string]string{
+	"":         "ResourceSliceList is a collection of ResourceSlices.",
+	"metadata": "Standard list metadata",
+	"items":    "Items is the list of node resource capacity objects.",
+}
+
+func (ResourceSliceList) SwaggerDoc() map[string]string {
+	return map_ResourceSliceList
+}
+
 var map_StructuredResourceHandle = map[string]string{
 	"":                      "StructuredResourceHandle is the in-tree representation of the allocation result.",
 	"vendorClassParameters": "VendorClassParameters are the per-claim configuration parameters from the resource class at the time that the claim was allocated.",
 	"vendorClaimParameters": "VendorClaimParameters are the per-claim configuration parameters from the resource claim parameters at the time that the claim was allocated.",
-	"nodeName":              "NodeName is the name of the node providing the necessary resources.",
+	"nodeName":              "NodeName is the name of the node providing the necessary resources if the resources are local to a node.",
 	"results":               "Results lists all allocated driver resources.",
 }
 

resource/v1alpha2/types.go

@@ -1,5 +1,5 @@
 {
-  "kind": "NodeResourceSlice",
+  "kind": "ResourceSlice",
   "apiVersion": "resource.k8s.io/v1alpha2",
   "metadata": {
     "name": "nameValue",

resource/v1alpha2/types_swagger_doc_generated.go

@@ -1,6 +1,6 @@
 apiVersion: resource.k8s.io/v1alpha2
 driverName: driverNameValue
-kind: NodeResourceSlice
+kind: ResourceSlice
 metadata:
   annotations:
     annotationsKey: annotationsValue