Change topology key constant and remove some TODOs

Author: davidz627

pkg/common/constants.go

@@ -21,6 +21,6 @@ const (
 	ParameterKeyZone = "zone"
 	ParameterKeyType = "type"
 
-	// Keys for Topology
-	TopologyKeyZone = "com.google.gcp-compute-persistent-disk-csi-driver.topology/zone"
+	// Keys for Topology. This key will be shared amonst drivers from GCP
+	TopologyKeyZone = "com.google.topology/zone"
 )

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

@@ -97,8 +97,6 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		}
 	}
 
-	// Topology overwrites Storage Class Params if specified
-	// TODO: Support preferred topologies.
 	if req.GetAccessibilityRequirements() != nil {
 		if len(configuredZone) != 0 {
 			return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("CreateVolume only one of parameter zone or topology zone may be specified"))

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

@@ -28,7 +28,7 @@ func initGCEDriver(t *testing.T) *GCEDriver {
 	if err != nil {
 		t.Fatalf("Failed to create fake cloud provider: %v", err)
 	}
-	err = gceDriver.SetupGCEDriver(fakeCloudProvider, nil, nil,metadataservice.NewFakeService(), driver, node, vendorVersion)
+	err = gceDriver.SetupGCEDriver(fakeCloudProvider, nil, nil, metadataservice.NewFakeService(), driver, node, vendorVersion)
 	if err != nil {
 		t.Fatalf("Failed to setup GCE Driver: %v", err)
 	}

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

@@ -31,9 +31,9 @@ import (
 )
 
 type GCENodeServer struct {
-	Driver      *GCEDriver
-	Mounter     *mount.SafeFormatAndMount
-	DeviceUtils mountmanager.DeviceUtils
+	Driver          *GCEDriver
+	Mounter         *mount.SafeFormatAndMount
+	DeviceUtils     mountmanager.DeviceUtils
 	MetadataService metadataservice.MetadataService
 	// TODO: Only lock mutually exclusive calls and make locking more fine grained
 	mux sync.Mutex

test/run-e2e.sh

@@ -5,4 +5,4 @@ set -x
 
 readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-go test --v=true "${PKGDIR}/test/e2e/tests" --logtostderr --run-in-prow=true --delete-instances=true
+go test --v=true "${PKGDIR}/test/e2e/tests" --logtostderr --run-in-prow=true --delete-instances=true

test/sanity/sanity_test.go

@@ -47,7 +47,7 @@ func TestSanity(t *testing.T) {
 	deviceUtils := mountmanager.NewFakeDeviceUtils()
 
 	//Initialize GCE Driver
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter,deviceUtils, metadataservice.NewFakeService(), driverName, nodeID, vendorVersion)
+	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, deviceUtils, metadataservice.NewFakeService(), driverName, nodeID, vendorVersion)
 	if err != nil {
 		t.Fatalf("Failed to initialize GCE CSI Driver: %v", err)
 	}