Remove querying of node labels

we will rely solely on the binary flag to decide when to apply the
labels

Author: julianKatz

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

@@ -39,7 +39,6 @@ import (
 	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/metrics"
 	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
-	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/nodelabels"
 )
 
 var (
@@ -242,20 +241,6 @@ func handle() {
 			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)
-			}
-			klog.V(2).Infof("Setting up node lister with informer")
-			labelVerifier, err := nodelabels.NewVerifier(ctx, kubeClient)
-			if err != nil {
-				klog.Fatalf("Failed to create node label verifier: %v", err)
-			}
-			args.LabelVerifier = labelVerifier
-		}
-
 		controllerServer = driver.NewControllerServer(gceDriver, cloudProvider, initialBackoffDuration, maxBackoffDuration, fallbackRequisiteZones, *enableStoragePoolsFlag, *enableDataCacheFlag, multiZoneVolumeHandleConfig, listVolumesConfig, provisionableDisksConfig, *enableHdHAFlag, args)
 	} else if *cloudConfigFilePath != "" {
 		klog.Warningf("controller service is disabled but cloud config given - it has no effect")

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

@@ -40,7 +40,6 @@ import (
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/metrics"
-	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/nodelabels"
 )
 
 type GCEControllerServer struct {
@@ -123,12 +122,10 @@ type GCEControllerServer struct {
 	csi.UnimplementedControllerServer
 
 	EnableDiskTopology bool
-	LabelVerifier      *nodelabels.Verifier
 }
 
 type GCEControllerServerArgs struct {
 	EnableDiskTopology bool
-	LabelVerifier      *nodelabels.Verifier
 }
 
 type MultiZoneVolumeHandleConfig struct {
@@ -2431,14 +2428,7 @@ func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk
 		}
 
 		if gceCS.EnableDiskTopology {
-			klog.V(4).Infof("Verifying disk support labels on cluster nodes before adding disk support topology")
-			addDiskSupportTopology, err := gceCS.allNodesHaveDiskSupportLabel()
-			if err != nil {
-				return nil, fmt.Errorf("failed to check if all nodes have disk support label: %w", err)
-			}
-			if addDiskSupportTopology {
-				top.Segments[common.TopologyLabelKey(params.DiskType)] = "true"
-			}
+			top.Segments[common.TopologyLabelKey(params.DiskType)] = "true"
 		}
 
 		tops = append(tops, top)
@@ -2498,21 +2488,13 @@ func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk
 	return createResp, nil
 }
 
-func (gceCS *GCEControllerServer) allNodesHaveDiskSupportLabel() (bool, error) {
-	allNodesHaveDiskSupportLabel, err := gceCS.LabelVerifier.AllNodesHaveDiskSupportLabel()
-	if err != nil {
-		return false, fmt.Errorf("failed to check if all nodes have disk support label: %w", err)
-	}
-	return allNodesHaveDiskSupportLabel, nil
-}
-
 func getResourceId(resourceLink string) (string, error) {
 	url, err := neturl.Parse(resourceLink)
 	if err != nil {
-		return "", fmt.Errorf("Could not parse resource %s: %w", resourceLink, err)
+		return "", fmt.Errorf("could not parse resource %s: %w", resourceLink, err)
 	}
 	if url.Scheme != resourceApiScheme {
-		return "", fmt.Errorf("Unexpected API scheme for resource %s", resourceLink)
+		return "", fmt.Errorf("unexpected API scheme for resource %s", resourceLink)
 	}
 
 	// Note that the resource host can basically be anything, if we are running in
@@ -2521,16 +2503,16 @@ func getResourceId(resourceLink string) (string, error) {
 	// The path should be /compute/VERSION/project/....
 	elts := strings.Split(url.Path, "/")
 	if len(elts) < 4 {
-		return "", fmt.Errorf("Short resource path %s", resourceLink)
+		return "", fmt.Errorf("short resource path %s", resourceLink)
 	}
 	if elts[1] != resourceApiService {
-		return "", fmt.Errorf("Bad resource service %s in %s", elts[1], resourceLink)
+		return "", fmt.Errorf("bad resource service %s in %s", elts[1], resourceLink)
 	}
 	if _, ok := validResourceApiVersions[elts[2]]; !ok {
-		return "", fmt.Errorf("Bad version %s in %s", elts[2], resourceLink)
+		return "", fmt.Errorf("bad version %s in %s", elts[2], resourceLink)
 	}
 	if elts[3] != resourceProject {
-		return "", fmt.Errorf("Expected %v to start with %s in resource %s", elts[3:], resourceProject, resourceLink)
+		return "", fmt.Errorf("expected %v to start with %s in resource %s", elts[3:], resourceProject, resourceLink)
 	}
 	return strings.Join(elts[3:], "/"), nil
 }

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

@@ -37,8 +37,6 @@ import (
 	"google.golang.org/api/googleapi"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/klog/v2"
@@ -49,7 +47,6 @@ import (
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
 	gcecloudprovider "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
-	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/nodelabels"
 )
 
 const (
@@ -1383,19 +1380,7 @@ func TestCreateVolumeArguments(t *testing.T) {
 		t.Logf("test case: %s", tc.name)
 
 		// Setup new driver each time so no interference
-		args := &GCEControllerServerArgs{
-			EnableDiskTopology: tc.enableDiskTopology,
-			LabelVerifier: nodelabels.NewFakeVerifier(t, []*corev1.Node{
-				{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "node-with-disk-support-label",
-						Labels: map[string]string{
-							common.TopologyLabelKey(stdDiskType): "true",
-						},
-					},
-				},
-			}),
-		}
+		args := &GCEControllerServerArgs{EnableDiskTopology: tc.enableDiskTopology}
 		gceDriver := initGCEDriver(t, nil, args)
 		gceDriver.cs.enableStoragePools = tc.enableStoragePools
 

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

@@ -175,7 +175,6 @@ func NewControllerServer(gceDriver *GCEDriver, cloudProvider gce.GCECompute, err
 		provisionableDisksConfig:    provisionableDisksConfig,
 		enableHdHA:                  enableHdHA,
 		EnableDiskTopology:          args.EnableDiskTopology,
-		LabelVerifier:               args.LabelVerifier,
 	}
 }