Merge pull request kubernetes#123932 from pohly/dra-api-resource-model-rename

dra api: NodeResourceModel -> ResourceModel

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -314,7 +314,7 @@
         "type": "object"
       },
       "io.k8s.api.resource.v1alpha2.NamedResourcesResources": {
-        "description": "NamedResourcesResources is used in NodeResourceModel.",
+        "description": "NamedResourcesResources is used in ResourceModel.",
         "properties": {
           "instances": {
             "description": "The list of all individual resources instances currently available.",

api/openapi-spec/v3/apis__resource.k8s.io__v1alpha2_openapi.json

@@ -18,7 +18,7 @@ package resource
 
 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.
 	Instances []NamedResourcesInstance

pkg/apis/resource/namedresources.go

@@ -499,11 +499,11 @@ type ResourceSlice struct {
 	// objects with a certain driver name.
 	DriverName string
 
-	NodeResourceModel
+	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.
 	NamedResources *NamedResourcesResources
 }

pkg/apis/resource/types.go

@@ -397,11 +397,11 @@ func ValidateResourceSlice(resourceSlice *resource.ResourceSlice) field.ErrorLis
 		allErrs = append(allErrs, validateNodeName(resourceSlice.NodeName, field.NewPath("nodeName"))...)
 	}
 	allErrs = append(allErrs, validateResourceDriverName(resourceSlice.DriverName, field.NewPath("driverName"))...)
-	allErrs = append(allErrs, validateNodeResourceModel(&resourceSlice.NodeResourceModel, nil)...)
+	allErrs = append(allErrs, validateResourceModel(&resourceSlice.ResourceModel, nil)...)
 	return allErrs
 }
 
-func validateNodeResourceModel(model *resource.NodeResourceModel, fldPath *field.Path) field.ErrorList {
+func validateResourceModel(model *resource.ResourceModel, fldPath *field.Path) field.ErrorList {
 	var allErrs field.ErrorList
 	entries := sets.New[string]()
 	if model.NamedResources != nil {

pkg/apis/resource/v1alpha2/zz_generated.conversion.go

@@ -34,7 +34,7 @@ func testResourceSlice(name, nodeName, driverName string) *resource.ResourceSlic
 		},
 		NodeName:   nodeName,
 		DriverName: driverName,
-		NodeResourceModel: resource.NodeResourceModel{
+		ResourceModel: resource.ResourceModel{
 			NamedResources: &resource.NamedResourcesResources{},
 		},
 	}
@@ -192,7 +192,7 @@ func TestValidateResourceSlice(t *testing.T) {
 			wantFailures: field.ErrorList{field.Required(nil, "exactly one structured model field must be set")},
 			slice: func() *resource.ResourceSlice {
 				slice := testResourceSlice(goodName, goodName, driverName)
-				slice.NodeResourceModel = resource.NodeResourceModel{}
+				slice.ResourceModel = resource.ResourceModel{}
 				return slice
 			}(),
 		},