DRA kubelet: rename gRPC server from Node to DRAPlugin in v1beta1

The version bump is an opportunity to pick a name that is a bit more
descriptive. It matches the "DevicePlugin" service name.

Author: pohly

pkg/kubelet/cm/dra/manager_test.go

@@ -52,7 +52,7 @@ const (
 )
 
 type fakeDRADriverGRPCServer struct {
-	drapb.UnimplementedNodeServer
+	drapb.UnimplementedDRAPluginServer
 	driverName                 string
 	timeout                    *time.Duration
 	prepareResourceCalls       atomic.Uint32
@@ -161,7 +161,7 @@ func setupFakeDRADriverGRPCServer(ctx context.Context, shouldTimeout bool, plugi
 		fakeDRADriverGRPCServer.timeout = &timeout
 	}
 
-	drapb.RegisterNodeServer(s, fakeDRADriverGRPCServer)
+	drapb.RegisterDRAPluginServer(s, fakeDRADriverGRPCServer)
 
 	go func(ctx context.Context) {
 		go func() {

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

@@ -134,15 +134,15 @@ func (p *Plugin) NodePrepareResources(
 	var response *drapbv1beta1.NodePrepareResourcesResponse
 	switch supportedAPI {
 	case apiV1beta1:
-		nodeClient := drapbv1beta1.NewNodeClient(conn)
+		nodeClient := drapbv1beta1.NewDRAPluginClient(conn)
 		response, err = nodeClient.NodePrepareResources(ctx, req)
 	case apiV1alpha4:
 		nodeClient := drapbv1alpha4.NewNodeClient(conn)
 		response, err = nodeClient.NodePrepareResources(ctx, req)
 	default:
 		// Try it, fall back if necessary.
 		supportedAPI = apiV1beta1
-		nodeClient := drapbv1beta1.NewNodeClient(conn)
+		nodeClient := drapbv1beta1.NewDRAPluginClient(conn)
 		response, err = nodeClient.NodePrepareResources(ctx, req)
 		if err != nil && status.Convert(err).Code() == codes.Unimplemented {
 			supportedAPI = apiV1alpha4
@@ -179,15 +179,15 @@ func (p *Plugin) NodeUnprepareResources(
 	var response *drapbv1beta1.NodeUnprepareResourcesResponse
 	switch supportedAPI {
 	case apiV1beta1:
-		nodeClient := drapbv1beta1.NewNodeClient(conn)
+		nodeClient := drapbv1beta1.NewDRAPluginClient(conn)
 		response, err = nodeClient.NodeUnprepareResources(ctx, req)
 	case apiV1alpha4:
 		nodeClient := drapbv1alpha4.NewNodeClient(conn)
 		response, err = nodeClient.NodeUnprepareResources(ctx, req)
 	default:
 		// Try it, fall back if necessary.
 		supportedAPI = apiV1beta1
-		nodeClient := drapbv1beta1.NewNodeClient(conn)
+		nodeClient := drapbv1beta1.NewDRAPluginClient(conn)
 		response, err = nodeClient.NodeUnprepareResources(ctx, req)
 		if err != nil && status.Convert(err).Code() == codes.Unimplemented {
 			supportedAPI = apiV1alpha4

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

@@ -36,10 +36,10 @@ const (
 )
 
 type fakeV1alpha4GRPCServer struct {
-	drapb.UnimplementedNodeServer
+	drapb.UnimplementedDRAPluginServer
 }
 
-var _ drapb.NodeServer = &fakeV1alpha4GRPCServer{}
+var _ drapb.DRAPluginServer = &fakeV1alpha4GRPCServer{}
 
 func (f *fakeV1alpha4GRPCServer) NodePrepareResources(ctx context.Context, in *drapb.NodePrepareResourcesRequest) (*drapb.NodePrepareResourcesResponse, error) {
 	return &drapb.NodePrepareResourcesResponse{Claims: map[string]*drapb.NodePrepareResourceResponse{"claim-uid": {
@@ -84,7 +84,7 @@ func setupFakeGRPCServer(version string) (string, tearDown, error) {
 	switch version {
 	case v1alpha4Version:
 		fakeGRPCServer := &fakeV1alpha4GRPCServer{}
-		drapb.RegisterNodeServer(s, fakeGRPCServer)
+		drapb.RegisterDRAPluginServer(s, fakeGRPCServer)
 	default:
 		return "", nil, fmt.Errorf("unsupported version: %s", version)
 	}

staging/src/k8s.io/dynamic-resource-allocation/kubeletplugin/draplugin.go

@@ -333,13 +333,13 @@ func Start(ctx context.Context, nodeServer interface{}, opts ...Option) (result
 	implemented := false
 	plugin, err := startGRPCServer(klog.NewContext(ctx, klog.LoggerWithName(logger, "dra")), o.grpcVerbosity, o.unaryInterceptors, o.streamInterceptors, o.draEndpoint, func(grpcServer *grpc.Server) {
 		if nodeServer, ok := nodeServer.(drapbv1alpha4.NodeServer); ok && o.nodeV1alpha4 {
-			logger.V(5).Info("registering drapbv1alpha4.NodeServer")
+			logger.V(5).Info("registering v1alpha4.Node gGRPC service")
 			drapbv1alpha4.RegisterNodeServer(grpcServer, nodeServer)
 			implemented = true
 		}
-		if nodeServer, ok := nodeServer.(drapbv1beta1.NodeServer); ok && o.nodeV1beta1 {
-			logger.V(5).Info("registering drapbv1beta1.NodeServer")
-			drapbv1beta1.RegisterNodeServer(grpcServer, nodeServer)
+		if nodeServer, ok := nodeServer.(drapbv1beta1.DRAPluginServer); ok && o.nodeV1beta1 {
+			logger.V(5).Info("registering v1beta1.DRAPlugin gRPC service")
+			drapbv1beta1.RegisterDRAPluginServer(grpcServer, nodeServer)
 			implemented = true
 		}
 	})

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

@@ -32,9 +32,10 @@ option (gogoproto.sizer_all) = true;
 option (gogoproto.unmarshaler_all) = true;
 option (gogoproto.goproto_unrecognized_all) = false;
 
-// The v1beta1 Node service has the exact same methods as the previous alpha,
-// so gRPC serves can provide both services with the same implementation.
-service Node {
+// The v1beta1 DRAPlugin service has the exact same methods as the Node
+// service in the previous alpha, so gRPC serves can provide both
+// services with the same implementation.
+service DRAPlugin {
   // NodePrepareResources prepares several ResourceClaims
   // for use on the node. If an error is returned, the
   // response is ignored. Failures for individual claims

staging/src/k8s.io/kubelet/pkg/apis/dra/v1beta1/api.proto

@@ -37,4 +37,5 @@ type (
 	Claim                          = v1alpha4.Claim
 )
 
-var _ NodeServer = v1alpha4.NodeServer(nil)
+// Ensure that the interfaces are equivalent.
+var _ DRAPluginServer = v1alpha4.NodeServer(nil)

staging/src/k8s.io/kubelet/pkg/apis/dra/v1beta1/types.go

@@ -65,8 +65,8 @@ import (
 )
 
 const (
-	NodePrepareResourcesMethod   = "/v1beta1.Node/NodePrepareResources"
-	NodeUnprepareResourcesMethod = "/v1beta1.Node/NodeUnprepareResources"
+	NodePrepareResourcesMethod   = "/v1beta1.DRAPlugin/NodePrepareResources"
+	NodeUnprepareResourcesMethod = "/v1beta1.DRAPlugin/NodeUnprepareResources"
 )
 
 type Nodes struct {

test/e2e/dra/deploy.go

@@ -97,7 +97,7 @@ type Device struct {
 	CDIDeviceID string
 }
 
-var _ drapb.NodeServer = &ExamplePlugin{}
+var _ drapb.DRAPluginServer = &ExamplePlugin{}
 
 // getJSONFilePath returns the absolute path where CDI file is/should be.
 func (ex *ExamplePlugin) getJSONFilePath(claimUID string, requestName string) string {