DRA: read ResourceClaim in DRA drivers

This is the second and final step towards making kubelet independent of the
resource.k8s.io API versioning because it now doesn't need to copy structs
defined by that API from the driver to the API server.

Author: pohly

pkg/kubelet/cm/dra/manager.go

@@ -224,13 +224,9 @@ func (m *ManagerImpl) PrepareResources(pod *v1.Pod) error {
 			// Loop through all plugins and prepare for calling NodePrepareResources.
 			for _, resourceHandle := range claimInfo.ResourceHandles {
 				claim := &drapb.Claim{
-					Namespace:      claimInfo.Namespace,
-					Uid:            string(claimInfo.ClaimUID),
-					Name:           claimInfo.ClaimName,
-					ResourceHandle: resourceHandle.Data,
-				}
-				if resourceHandle.StructuredData != nil {
-					claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData}
+					Namespace: claimInfo.Namespace,
+					Uid:       string(claimInfo.ClaimUID),
+					Name:      claimInfo.ClaimName,
 				}
 				pluginName := resourceHandle.DriverName
 				batches[pluginName] = append(batches[pluginName], claim)
@@ -455,13 +451,9 @@ func (m *ManagerImpl) unprepareResources(podUID types.UID, namespace string, cla
 			// Loop through all plugins and prepare for calling NodeUnprepareResources.
 			for _, resourceHandle := range claimInfo.ResourceHandles {
 				claim := &drapb.Claim{
-					Namespace:      claimInfo.Namespace,
-					Uid:            string(claimInfo.ClaimUID),
-					Name:           claimInfo.ClaimName,
-					ResourceHandle: resourceHandle.Data,
-				}
-				if resourceHandle.StructuredData != nil {
-					claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData}
+					Namespace: claimInfo.Namespace,
+					Uid:       string(claimInfo.ClaimUID),
+					Name:      claimInfo.ClaimName,
 				}
 				pluginName := resourceHandle.DriverName
 				batches[pluginName] = append(batches[pluginName], claim)

pkg/kubelet/cm/dra/plugin/client_test.go

@@ -135,10 +135,9 @@ func TestGRPCConnIsReused(t *testing.T) {
 			req := &drapbv1alpha3.NodePrepareResourcesRequest{
 				Claims: []*drapbv1alpha3.Claim{
 					{
-						Namespace:      "dummy-namespace",
-						Uid:            "dummy-uid",
-						Name:           "dummy-claim",
-						ResourceHandle: "dummy-resource",
+						Namespace: "dummy-namespace",
+						Uid:       "dummy-uid",
+						Name:      "dummy-claim",
 					},
 				},
 			}

staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha3/api.pb.go

@@ -22,7 +22,6 @@ package v1alpha3;
 option go_package = "k8s.io/kubelet/pkg/apis/dra/v1alpha3";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-import "k8s.io/api/resource/v1alpha2/generated.proto";
 
 option (gogoproto.goproto_stringer_all) = false;
 option (gogoproto.stringer_all) =  true;
@@ -102,13 +101,4 @@ message Claim {
     // The name of the Resource claim (ResourceClaim.meta.Name)
     // This field is REQUIRED.
     string name = 3;
-    // Resource handle (AllocationResult.ResourceHandles[*].Data)
-    // This field is REQUIRED.
-    string resource_handle = 4;
-    // Structured parameter resource handle (AllocationResult.ResourceHandles[*].StructuredData).
-    // This field is OPTIONAL. If present, it needs to be used
-    // instead of resource_handle. It will only have a single entry.
-    //
-    // Using "repeated" instead of "optional" is a workaround for https://github.com/gogo/protobuf/issues/713.
-    repeated k8s.io.api.resource.v1alpha2.StructuredResourceHandle structured_resource_handle = 5;
 }