Remove NodeGetInfo kubeclient calls

Author: julianKatz

cmd/gce-pd-csi-driver/main.go

@@ -280,16 +280,6 @@ func handle() {
 			DeviceInUseTimeout:       *deviceInUseTimeout,
 			EnableDataCache:          *enableDataCacheFlag,
 			DataCacheEnabledNodePool: isDataCacheEnabledNodePool,
-			EnableDiskTopology:       *diskTopology,
-		}
-
-		if *diskTopology {
-			klog.V(2).Infof("Setting up kubeClient")
-			kubeClient, err := instantiateKubeClient()
-			if err != nil {
-				klog.Fatalf("Failed to instantiate Kubernetes client: %v", err)
-			}
-			nsArgs.KubeClient = kubeClient
 		}
 
 		nodeServer = driver.NewNodeServer(gceDriver, mounter, deviceUtils, meta, statter, nsArgs)

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

@@ -157,8 +157,6 @@ func NewNodeServer(gceDriver *GCEDriver, mounter *mount.SafeFormatAndMount, devi
 		deviceInUseErrors:        newDeviceErrMap(args.DeviceInUseTimeout),
 		EnableDataCache:          args.EnableDataCache,
 		DataCacheEnabledNodePool: args.DataCacheEnabledNodePool,
-		KubeClient:               args.KubeClient,
-		EnableDiskTopology:       args.EnableDiskTopology,
 	}
 }
 

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

@@ -35,7 +35,6 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/mount-utils"
 
-	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	"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"
@@ -52,14 +51,11 @@ type GCENodeServer struct {
 	EnableDataCache          bool
 	DataCacheEnabledNodePool bool
 
-	KubeClient         kubernetes.Interface
-	EnableDiskTopology bool
-
 	// A map storing all volumes with ongoing operations so that additional operations
 	// for that same volume (as defined by VolumeID) return an Aborted error
 	volumeLocks *common.VolumeLocks
 
-	// enableDeviceInUseCheck, if true, will block NodeUnstageVolume requests if the specified
+	// enableDeviceInUseCheck, if true, will block NodeUnstageVolume request if the specified
 	// device is still in use (or until --device-in-use-timeout is reached, if specified)
 	enableDeviceInUseCheck bool
 	// deviceInUseErrors keeps tracks of device names and a timestamp for when an error is
@@ -90,10 +86,6 @@ type NodeServerArgs struct {
 	EnableDataCache bool
 
 	DataCacheEnabledNodePool bool
-
-	KubeClient kubernetes.Interface
-
-	EnableDiskTopology bool
 }
 
 var _ csi.NodeServer = &GCENodeServer{}
@@ -580,20 +572,6 @@ func (ns *GCENodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRe
 		},
 	}
 
-	if ns.EnableDiskTopology {
-		labels, err := ns.fetchGKETopologyLabels(ctx, ns.MetadataService.GetName())
-		if err != nil {
-			// Perhaps we don't want to fail here.  We are introducing a new
-			// dependency and we might be better off allowing this failure to
-			// happen and moving on to retrieve the zone from GCE MDS.
-			return nil, err
-		}
-
-		for k, v := range labels {
-			top.Segments[k] = v
-		}
-	}
-
 	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.MetadataService.GetName())
 	volumeLimits, err := ns.GetVolumeLimits()
 	if err != nil {

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

@@ -65,13 +65,6 @@ func getTestGCEDriverWithCustomMounter(t *testing.T, mounter *mount.SafeFormatAn
 	return getCustomTestGCEDriver(t, mounter, deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), &NodeServerArgs{})
 }
 
-func getTestGCEDriverWithMockKubeClient(t *testing.T, kubeClient kubernetes.Interface) *GCEDriver {
-	args := &NodeServerArgs{
-		KubeClient: kubeClient,
-	}
-	return getCustomTestGCEDriver(t, mountmanager.NewFakeSafeMounter(), deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), args)
-}
-
 func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, deviceUtils deviceutils.DeviceUtils, metaService metadataservice.MetadataService, args *NodeServerArgs) *GCEDriver {
 	gceDriver := GetGCEDriver()
 	nodeServer := NewNodeServer(gceDriver, mounter, deviceUtils, metaService, mountmanager.NewFakeStatter(mounter), args)
@@ -384,7 +377,7 @@ func TestNodeGetInfo_Topologies(t *testing.T) {
 			},
 		},
 	}
-	gceDriver := getTestGCEDriverWithMockKubeClient(t, NewFakeKubeClient([]*corev1.Node{nodeA, nodeB}))
+	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns
 
 	volumeLimit, err := ns.GetVolumeLimits()