More cleanup related to NodeGetinfo

Author: julianKatz

pkg/gce-pd-csi-driver/node.go

@@ -566,12 +566,11 @@ func (ns *GCENodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeG
 
 func (ns *GCENodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
 	top := &csi.Topology{
-		Segments: map[string]string{
-			common.TopologyKeyZone: ns.MetadataService.GetZone(),
-		},
+		Segments: map[string]string{common.TopologyKeyZone: ns.MetadataService.GetZone()},
 	}
 
 	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.MetadataService.GetName())
+
 	volumeLimits, err := ns.GetVolumeLimits()
 	if err != nil {
 		klog.Errorf("GetVolumeLimits failed: %v", err.Error())
@@ -582,9 +581,6 @@ func (ns *GCENodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRe
 		MaxVolumesPerNode:  volumeLimits,
 		AccessibleTopology: top,
 	}
-
-	klog.V(2).Infof("Returning NodeGetInfoResponse: %+v", resp)
-
 	return resp, err
 }
 

pkg/gce-pd-csi-driver/node_test.go

@@ -24,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/utils/exec"
 	testingexec "k8s.io/utils/exec/testing"
 
@@ -36,22 +35,12 @@ import (
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
 	metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
 	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
-
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/fake"
 )
 
 const (
 	defaultVolumeID    = "project/test001/zones/c1/disks/testDisk"
 	defaultTargetPath  = "/mnt/test"
 	defaultStagingPath = "/staging"
-	testZoneA          = "test-zone-a"
-	testZoneB          = "test-zone-b"
-	testDiskA          = "testDiskA"
-	testDiskB          = "testDiskB"
-	testNodeA          = "test-node-a"
-	testNodeB          = "test-node-b"
 )
 
 func getTestGCEDriver(t *testing.T) *GCEDriver {
@@ -341,20 +330,6 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 	}
 }
 
-// NewFakeKubeClient creates a fake Kubernetes client with predefined nodes.
-func NewFakeKubeClient(nodes []*corev1.Node) kubernetes.Interface {
-	// Convert the list of nodes to a slice of runtime.Object
-	var objects []runtime.Object
-	for _, node := range nodes {
-		objects = append(objects, node)
-	}
-
-	// Create a fake clientset with the predefined objects
-	clientset := fake.NewSimpleClientset(objects...)
-
-	return clientset
-}
-
 func TestNodePublishVolume(t *testing.T) {
 	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns

pkg/nodelabels/verifier_test.go

@@ -63,7 +63,7 @@ func TestAllNodesHaveDiskSupportLabel(t *testing.T) {
 			expected: false,
 		},
 		{
-			name: "only zone labels are not sufficient",
+			name: "only zone labels",
 			nodes: []*corev1.Node{
 				{
 					ObjectMeta: metav1.ObjectMeta{