Merge remote-tracking branch 'origin/master' into helm

# Conflicts:
#	README.md

README.md

@@ -45,7 +45,8 @@ $ kubectl delete -f deploy/kubernetes/sample-busybox-pod.yaml
 $ kubectl delete -f deploy/kubernetes/sample-seaweedfs-pvc.yaml
 $ kubectl delete -f deploy/kubernetes/seaweedfs-csi.yaml
 ```
-## Install by helm chart
+
+# Deployment by helm chart
 
 1. Clone project 
 ```bash
@@ -53,7 +54,7 @@ git clone https://github.com/seaweedfs/seaweedfs-csi-driver.git
 ```
 2. Install
 ```bash
-helm install --set seaweedfsFiller=<url to filer host:port> seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver
+helm install --set seaweedfsFiler=<filerHost:port> seaweedfs-csi-driver ./seaweedfs-csi-driver/deploy/helm/seaweedfs-csi-driver
 ```
 
 3. Clean up

deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml

@@ -60,7 +60,7 @@ spec:
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
             - name: SEAWEEDFS_FILER
-              value: {{ .Values.seaweedfsFiller | quote }}
+              value: {{ .Values.seaweedfsFiler | quote }}
             - name: NODE_ID
               valueFrom:
                 fieldRef:

deploy/helm/seaweedfs-csi-driver/templates/statefulset.yml

@@ -63,7 +63,7 @@ spec:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
             - name: SEAWEEDFS_FILER
-              value: {{ .Values.seaweedfsFiller | quote }}
+              value: {{ .Values.seaweedfsFiler | quote }}
             - name: NODE_ID
               valueFrom:
                 fieldRef:

deploy/helm/seaweedfs-csi-driver/values.yaml

@@ -1,6 +1,6 @@
 
 # host and port of your SeaweedFs filer
-seaweedfsFiller: ""
+seaweedfsFiler: ""
 storageClassName: seaweedfs-storage
 isDefaultStorageClass: false
 tlsSecret: ""

pkg/driver/mounter.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/weed/glog"
 	"os/exec"
+
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"k8s.io/utils/mount"
 )
 
@@ -19,8 +20,8 @@ type Mounter interface {
 	Mount(target string) error
 }
 
-func newMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) {
-	return newSeaweedFsMounter(bucketName, driver)
+func newMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) {
+	return newSeaweedFsMounter(bucketName, driver, volContext)
 }
 
 func fuseMount(path string, command string, args []string) error {

pkg/driver/mounter_seaweedfs.go

@@ -10,21 +10,23 @@ import (
 type seaweedFsMounter struct {
 	bucketName string
 	driver     *SeaweedFsDriver
+	volContext map[string]string
 }
 
 const (
 	seaweedFsCmd = "weed"
 )
 
-func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) {
+func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) {
 	return &seaweedFsMounter{
 		bucketName: bucketName,
-		driver:   driver,
+		driver:     driver,
+		volContext: volContext,
 	}, nil
 }
 
 func (seaweedFs *seaweedFsMounter) Mount(target string) error {
-	glog.V(0).Infof("mounting %s%s to %s", seaweedFs.driver.filer, seaweedFs.bucketName, target)
+	glog.V(0).Infof("mounting %s %s to %s", seaweedFs.driver.filer, seaweedFs.bucketName, target)
 
 	args := []string{
 		"mount",
@@ -35,6 +37,16 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) error {
 		fmt.Sprintf("-filer=%s", seaweedFs.driver.filer),
 		fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName),
 	}
+
+	for arg, value := range seaweedFs.volContext {
+		switch arg {
+		case "map.uid":
+			args = append(args, fmt.Sprintf("-map.uid=%s", value))
+		case "map.gid":
+			args = append(args, fmt.Sprintf("-map.gid=%s", value))
+		}
+	}
+
 	if seaweedFs.driver.ConcurrentWriters > 0 {
 		args = append(args, fmt.Sprintf("-concurrentWriters=%d", seaweedFs.driver.ConcurrentWriters))
 	}

pkg/driver/nodeserver.go

@@ -55,7 +55,9 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 		mo = append(mo, "ro")
 	}
 
-	mounter, err := newMounter(volumeID, ns.Driver)
+	volContext := req.GetVolumeContext()
+
+	mounter, err := newMounter(volumeID, ns.Driver, volContext)
 	if err != nil {
 		return nil, err
 	}
@@ -163,4 +165,4 @@ func checkMount(targetPath string) (bool, error) {
 		}
 	}
 	return notMnt, nil
-}
+}