Makefile s/gce/gce-pd, added TODO, changed metadata.Zone() call, added

some rudimentary node call locking, changed volume size representations,
removed dummy service from statefulset definition.

Author: davidz627

Makefile

@@ -12,31 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-STAGINGIMAGE=gcr.io/dyzz-csi-staging/csi/gce-driver
+STAGINGIMAGE=gcr.io/dyzz-csi-staging/csi/gce-pd-driver
 STAGINGVERSION=latest
 
 PRODIMAGE=gcr.io/google-containers/volume-csi/compute-persistent-disk-csi-driver
 PRODVERSION=v0.2.0.alpha
-all: gce-driver
+all: gce-pd-driver
 
-gce-driver:
+gce-pd-driver:
 	mkdir -p bin
-	go build -o bin/gce-csi-driver ./cmd/
-	go build -o bin/gce-csi-driver-test ./test/e2e/
+	go build -o bin/gce-pd-csi-driver ./cmd/
+	go build -o bin/gce-pd-csi-driver-test ./test/e2e/
 
-build-container: gce-driver
-	cp bin/gce-csi-driver deploy/docker
+build-container: gce-pd-driver
+	cp bin/gce-pd-csi-driver deploy/docker
 	docker build -t $(STAGINGIMAGE):$(STAGINGVERSION) deploy/docker
 
 push-container: build-container
 	gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
 
-prod-build-container: gce-driver
-	cp bin/gce-csi-driver deploy/docker
+prod-build-container: gce-pd-driver
+	cp bin/gce-pd-csi-driver deploy/docker
 	docker build -t $(PRODIMAGE):$(PRODVERSION) deploy/docker
 
 prod-push-container: prod-build-container
 	gcloud docker -- push $(PRODIMAGE):$(PRODVERSION)
 
-test-sanity: gce-driver
+test-sanity: gce-pd-driver
 	go test -timeout 30s github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$

deploy/kubernetes/controller.yaml

@@ -1,19 +1,3 @@
-# The dummy service is required for creating a StatefulSet
-kind: Service
-apiVersion: v1
-metadata:
-  name: csi-gce-pd
-  labels:
-    app: csi-gce-pd
-spec:
-  selector:
-    app: csi-gce-pd
-  ports:
-    - name: dummy
-      port: 12345
-
----
-
 kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:

pkg/gce-cloud-provider/gce.go

@@ -19,7 +19,6 @@ import (
 	"net/http"
 	"os"
 	"runtime"
-	"strings"
 	"time"
 
 	"cloud.google.com/go/compute/metadata"
@@ -80,6 +79,7 @@ func createCloudServiceWithDefaultServiceAccount() (*compute.Service, error) {
 	if err != nil {
 		return nil, err
 	}
+	// TODO(dyzz) parameterize version number
 	service.UserAgent = fmt.Sprintf("GCE CSI Driver/%s (%s %s)", "0.2.0", runtime.GOOS, runtime.GOARCH)
 	return service, nil
 }
@@ -114,15 +114,10 @@ func newDefaultOauthClient() (*http.Client, error) {
 }
 
 func getProjectAndZoneFromMetadata() (string, string, error) {
-	result, err := metadata.Get("instance/zone")
+	zone, err := metadata.Zone()
 	if err != nil {
 		return "", "", err
 	}
-	parts := strings.Split(result, "/")
-	if len(parts) != 4 {
-		return "", "", fmt.Errorf("unexpected response: %s", result)
-	}
-	zone := parts[3]
 	projectID, err := metadata.ProjectID()
 	if err != nil {
 		return "", "", err

pkg/gce-csi-driver/controller.go

@@ -38,22 +38,22 @@ type GCEControllerServer struct {
 }
 
 const (
-	// MaxVolumeSize is the maximum standard and ssd size of 64TB
-	MaxVolumeSize       int64 = 64000000000000
-	DefaultVolumeSize   int64 = 5000000000
-	MinimumDiskSizeInGb       = 5
+	// MaxVolumeSizeInBytes is the maximum standard and ssd size of 64TB
+	MaxVolumeSizeInBytes     int64 = 64 * 1024 * 1024 * 1024 * 1024
+	MinimumVolumeSizeInBytes int64 = 5 * 1024 * 1024 * 1024
+	MinimumDiskSizeInGb            = 5
 
 	DiskTypeSSD      = "pd-ssd"
 	DiskTypeStandard = "pd-standard"
 	diskTypeDefault  = DiskTypeStandard
 
-	diskTypePersistent = "PERSISTENT"
+	attachableDiskTypePersistent = "PERSISTENT"
 )
 
 func getRequestCapacity(capRange *csi.CapacityRange) (capBytes int64) {
 	// TODO: Take another look at these casts/caps. Make sure this func is correct
 	if capRange == nil {
-		capBytes = DefaultVolumeSize
+		capBytes = MinimumVolumeSizeInBytes
 		return
 	}
 
@@ -63,8 +63,8 @@ func getRequestCapacity(capRange *csi.CapacityRange) (capBytes int64) {
 		capBytes = tcap
 	}
 	// Too small, default
-	if capBytes < DefaultVolumeSize {
-		capBytes = DefaultVolumeSize
+	if capBytes < MinimumVolumeSizeInBytes {
+		capBytes = MinimumVolumeSizeInBytes
 	}
 	return
 }
@@ -185,7 +185,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 
 func (gceCS *GCEControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
 	// TODO: Only allow deletion of volumes that were created by the driver
-	// Assuming ID is of form {project}/{zone}/{id}
+	// Assuming ID is of form {zone}/{id}
 	glog.Infof("DeleteVolume called with request %v", *req)
 
 	// Validate arguments
@@ -282,7 +282,7 @@ func (gceCS *GCEControllerServer) ControllerPublishVolume(ctx context.Context, r
 		Kind:       disk.Kind,
 		Mode:       readWrite,
 		Source:     source,
-		Type:       diskTypePersistent,
+		Type:       attachableDiskTypePersistent,
 	}
 
 	glog.Infof("Attaching disk %#v to instance %v", attachedDiskV1, nodeID)

pkg/gce-csi-driver/controller_test.go

@@ -93,7 +93,7 @@ func TestCreateVolumeArguments(t *testing.T) {
 				Parameters:         stdParams,
 			},
 			expVol: &csi.Volume{
-				CapacityBytes: DefaultVolumeSize,
+				CapacityBytes: MinimumVolumeSizeInBytes,
 				Id:            project + "/" + zone + "/" + "test-vol",
 				Attributes:    nil,
 			},
@@ -177,7 +177,7 @@ func TestCreateVolumeArguments(t *testing.T) {
 				Parameters:         stdParams,
 			},
 			expVol: &csi.Volume{
-				CapacityBytes: DefaultVolumeSize,
+				CapacityBytes: MinimumVolumeSizeInBytes,
 				Id:            project + "/" + zone + "/" + "test-vol",
 				Attributes:    nil,
 			},

pkg/gce-csi-driver/node.go

@@ -17,6 +17,7 @@ package gceGCEDriver
 import (
 	"fmt"
 	"os"
+	"sync"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"github.com/golang/glog"
@@ -30,9 +31,13 @@ import (
 type GCENodeServer struct {
 	Driver  *GCEDriver
 	Mounter mountmanager.Mounter
+	// TODO: Only lock mutually exclusive calls and make locking more fine grained
+	mux sync.Mutex
 }
 
 func (ns *GCENodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
+	ns.mux.Lock()
+	defer ns.mux.Unlock()
 	glog.Infof("NodePublishVolume called with req: %#v", req)
 
 	// Validate Arguments
@@ -108,6 +113,8 @@ func (ns *GCENodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePub
 }
 
 func (ns *GCENodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
+	ns.mux.Lock()
+	defer ns.mux.Unlock()
 	glog.Infof("NodeUnpublishVolume called with args: %v", req)
 	// Validate Arguments
 	targetPath := req.GetTargetPath()
@@ -130,6 +137,8 @@ func (ns *GCENodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeU
 }
 
 func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
+	ns.mux.Lock()
+	defer ns.mux.Unlock()
 	glog.Infof("NodeStageVolume called with req: %#v", req)
 
 	// Validate Arguments
@@ -218,6 +227,8 @@ func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStage
 }
 
 func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
+	ns.mux.Lock()
+	defer ns.mux.Unlock()
 	glog.Infof("NodeUnstageVolume called with req: %#v", req)
 	// Validate arguments
 	volumeID := req.GetVolumeId()