Merge branch 'master' into license

pkg/nfs/driver.go

@@ -54,7 +54,7 @@ func NewDriver(nodeID, endpoint string) *driver {
 	// NFS plugin does not support ControllerServiceCapability now.
 	// If support is added, it should set to appropriate
 	// ControllerServiceCapability RPC types.
-        csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN})
+	csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN})
 
 	d.csiDriver = csiDriver
 

pkg/nfs/examples/kubernetes/nginx.yaml

@@ -4,16 +4,17 @@ metadata:
   name: data-nfsplugin
   labels:
     name: data-nfsplugin
-  annotations:
-    csi.volume.kubernetes.io/volume-attributes: '{"server": "10.10.10.10", "share": "share"}'
 spec:
   accessModes:
-  - ReadWriteOnce
+  - ReadWriteMany
   capacity:
     storage: 100Gi
   csi:
     driver: csi-nfsplugin
     volumeHandle: data-id
+    volumeAttributes: 
+      server: 127.0.0.1
+      share: /export
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -21,7 +22,7 @@ metadata:
   name: data-nfsplugin
 spec:
   accessModes:
-  - ReadWriteOnce
+  - ReadWriteMany
   resources:
     requests:
       storage: 100Gi