Merge pull request kubernetes-sigs#9 from davidz627/feature/E2EtestNEW

Add first E2E test and changes to the framework required

Author: davidz627

Makefile

@@ -22,7 +22,6 @@ all: gce-pd-driver
 gce-pd-driver:
 	mkdir -p bin
 	go build -o bin/gce-pd-csi-driver ./cmd/
-	go build -o bin/gce-pd-csi-driver-test ./test/e2e/
 
 build-container: gce-pd-driver
 	docker build -t $(STAGINGIMAGE):$(STAGINGVERSION) .

pkg/gce-cloud-provider/fake-gce.go

@@ -45,11 +45,11 @@ func FakeCreateCloudProvider(project, zone string) (*FakeCloudProvider, error) {
 }
 
 // Getters
-func (cloud *FakeCloudProvider) GetProject() (string, error) {
-	return cloud.project, nil
+func (cloud *FakeCloudProvider) GetProject() string {
+	return cloud.project
 }
-func (cloud *FakeCloudProvider) GetZone() (string, error) {
-	return cloud.zone, nil
+func (cloud *FakeCloudProvider) GetZone() string {
+	return cloud.zone
 }
 
 // Disk Methods

pkg/gce-cloud-provider/gce-compute.go

@@ -30,8 +30,8 @@ import (
 
 type GCECompute interface {
 	// Getters
-	GetProject() (string, error)
-	GetZone() (string, error)
+	GetProject() string
+	GetZone() string
 	// Disk Methods
 	GetDiskOrError(ctx context.Context, volumeZone, volumeName string) (*compute.Disk, error)
 	GetAndValidateExistingDisk(ctx context.Context, configuredZone, name, diskType string, reqBytes, limBytes int64) (exists bool, err error)
@@ -47,12 +47,12 @@ type GCECompute interface {
 	WaitForOp(ctx context.Context, op *compute.Operation, zone string) error
 }
 
-func (cloud *CloudProvider) GetProject() (string, error) {
-	return cloud.project, nil
+func (cloud *CloudProvider) GetProject() string {
+	return cloud.project
 }
 
-func (cloud *CloudProvider) GetZone() (string, error) {
-	return cloud.zone, nil
+func (cloud *CloudProvider) GetZone() string {
+	return cloud.zone
 }
 
 func (cloud *CloudProvider) GetDiskOrError(ctx context.Context, volumeZone, volumeName string) (*compute.Disk, error) {

pkg/gce-csi-driver/controller.go

@@ -94,10 +94,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 	// Apply Parameters (case-insensitive). We leave validation of
 	// the values to the cloud provider.
 	diskType := "pd-standard"
-	configuredZone, err := gceCS.CloudProvider.GetZone()
-	if err != nil {
-		return nil, status.Error(codes.Internal, "CreateVolume failed to get zone")
-	}
+	configuredZone := gceCS.CloudProvider.GetZone()
 	for k, v := range req.GetParameters() {
 		if k == "csiProvisionerSecretName" || k == "csiProvisionerSecretNamespace" {
 			// These are hardcoded secrets keys required to function but not needed by GCE PD

pkg/mount-manager/mounter.go

@@ -30,7 +30,8 @@ import (
 )
 
 const (
-	diskByIdPath         = "/host/dev/disk/by-id/"
+	diskByHostIdPath     = "/host/dev/disk/by-id/"
+	diskByIdPath         = "/dev/disk/by-id/"
 	diskGooglePrefix     = "google-"
 	diskScsiGooglePrefix = "scsi-0Google_PersistentDisk_"
 	diskPartitionSuffix  = "-part"
@@ -193,6 +194,8 @@ func (m *GCEMounter) GetDiskByIdPaths(pdName string, partition string) []string
 	devicePaths := []string{
 		path.Join(diskByIdPath, diskGooglePrefix+pdName),
 		path.Join(diskByIdPath, diskScsiGooglePrefix+pdName),
+		path.Join(diskByHostIdPath, diskScsiGooglePrefix+pdName),
+		path.Join(diskByHostIdPath, diskScsiGooglePrefix+pdName),
 	}
 
 	if partition != "" {

test/README.md

@@ -1,2 +1,3 @@
-How to run Dev tests:
-go run test/remote/run_remote/run_remote.go --logtostderr --v 2 --project test-project --zone us-central1-c --ssh-env gce --delete-instances=false --cleanup=false --results-dir=my_test
+# How to run Dev tests:
+
+go run test/remote/run_remote/run_remote.go --logtostderr --v 2 --project dyzz-test --zone us-central1-c --ssh-env gce --delete-instances=false --cleanup=false --results-dir=my_test --service-account=${IAM_NAME}