[WIP] Add block supports to rbd driver

Gopkg.toml

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "~0.3.0"
+  version = "v1.0.0"
 
 [[constraint]]
   branch = "master"

deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccount: csi-attacher
       containers:
         - name: csi-rbdplugin-attacher
-          image: quay.io/k8scsi/csi-attacher:v0.3.0
+          image: gcr.io/gke-release/csi-attacher:v1.0.0-gke.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"

deploy/rbd/kubernetes/csi-rbdplugin.yaml

@@ -19,16 +19,12 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet      
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:v0.3.0
+          image: gcr.io/gke-release/csi-driver-registrar:v1.0.0-gke.0
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
-            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            - "--csi-address=/var/lib/kubelet/plugins/csi-rbdplugin/csi.sock"
+            - "--kubelet-registration-path=/var/lib/kubelet/plugins/csi-rbdplugin/csi.sock"
           env:
-            - name: ADDRESS
-              value: /var/lib/kubelet/plugins/csi-rbdplugin/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins/csi-rbdplugin/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -47,7 +43,7 @@ spec:
           image: quay.io/cephcsi/rbdplugin:v0.3.0
           args :
             - "--nodeid=$(NODE_ID)"
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - "--endpoint=unix://var/lib/kubelet/plugins/csi-rbdplugin/csi.sock"
             - "--v=5"
             - "--drivername=csi-rbdplugin"
             - "--containerized=true"            
@@ -58,12 +54,13 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            - name: CSI_ENDPOINT
-              value: unix://var/lib/kubelet/plugins/csi-rbdplugin/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: plugin-dir
               mountPath: /var/lib/kubelet/plugins/csi-rbdplugin
+            - name: plugin-mount-dir
+              mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices/
+              mountPropagation: "Bidirectional"
             - name: pods-mount-dir
               mountPath: /var/lib/kubelet/pods
               mountPropagation: "Bidirectional"
@@ -81,10 +78,14 @@ spec:
           hostPath:
             path: /var/lib/kubelet/plugins/csi-rbdplugin
             type: DirectoryOrCreate
+        - name: plugin-mount-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices/
+            type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/
-            type: Directory
+            path: /var/lib/kubelet/plugins_registry
+            type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
             path: /var/lib/kubelet/pods

pkg/cephfs/controllerserver.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 

pkg/cephfs/driver.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 

pkg/cephfs/identityserver.go

@@ -19,7 +19,7 @@ package cephfs
 import (
 	"context"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 

pkg/cephfs/nodeserver.go

@@ -25,7 +25,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 

pkg/cephfs/util.go

@@ -26,7 +26,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/pborman/uuid"
 	"k8s.io/kubernetes/pkg/util/mount"
 )