Merge pull request #38 from davidz627/fix/gcepdName

Changed all occurrences of gce- to gce-pd- when referencing the gce-pd driver

Author: k8s-ci-robot

.gitignore

@@ -1,6 +1,5 @@
 # Compiled binaries and deployment files 
 bin/
-deploy/docker/gce-csi-driver
 
 # Personal testing
 /my_test/

cmd/main.go

@@ -21,7 +21,7 @@ import (
 	"github.com/golang/glog"
 
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider"
-	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver"
+	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
 	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
 )
 

deploy/kubernetes/controller.yaml

@@ -1,7 +1,7 @@
 kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:
-  name: csi-gce-controller
+  name: csi-gce-pd-controller
 spec:
   serviceName: "csi-gce-pd"
   replicas: 1
@@ -40,9 +40,9 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-        - name: gce-driver
+        - name: gce-pd-driver
           imagePullPolicy: Always
-          image: gcr.io/dyzz-csi-staging/csi/gce-driver:latest
+          image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"

deploy/kubernetes/node.yaml

@@ -2,15 +2,15 @@
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
-  name: csi-gce-node
+  name: csi-gce-pd-node
 spec:
   selector:
     matchLabels:
-      app: csi-gce-driver
+      app: csi-gce-pd-driver
   template:
     metadata:
       labels:
-        app: csi-gce-driver
+        app: csi-gce-pd-driver
     spec:
       serviceAccount: csi-node-sa
       containers:
@@ -32,11 +32,11 @@ spec:
               mountPath: /csi
           #  - name: registrar-socket-dir
           #    mountPath: /var/lib/csi/sockets/
-        - name: gce-driver
+        - name: gce-pd-driver
           securityContext:
             privileged: true
           imagePullPolicy: Always
-          image: gcr.io/dyzz-csi-staging/csi/gce-driver:latest
+          image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"

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

@@ -32,7 +32,7 @@ import (
 
 	csipb "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider"
-	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver"
+	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

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

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+set -x
+
+readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
+
+go run "$GOPATH/src/${PKGDIR}/test/remote/run_remote/run_remote.go" --logtostderr --v 2 --project "${PROJECT}" --zone "${ZONE}" --ssh-env gce --delete-instances=true --cleanup=true --results-dir=my_test  --service-account="${IAM_NAME}"

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

@@ -22,7 +22,7 @@ import (
 	sanity "github.com/kubernetes-csi/csi-test/pkg/sanity"
 	compute "google.golang.org/api/compute/v1"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider"
-	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver"
+	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
 )
 
 func TestSanity(t *testing.T) {