From 4274180f3d180e079987ac754b22f30ae28df39e Mon Sep 17 00:00:00 2001
From: Daniel Santos <danlsgiga@gmail.com>
Date: Wed, 20 Jan 2021 13:58:29 -0700
Subject: [PATCH] Add mount arguments as CSI volume parameters

---
 pkg/driver/mounter.go           |  7 ++++---
 pkg/driver/mounter_seaweedfs.go | 22 +++++++++++++++++-----
 pkg/driver/nodeserver.go        |  6 ++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go
index 9aaa84a..389cbc9 100644
--- a/pkg/driver/mounter.go
+++ b/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, volParameters map[string]string) (Mounter, error) {
+	return newSeaweedFsMounter(bucketName, driver, volParameters)
 }
 
 func fuseMount(path string, command string, args []string) error {
diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go
index d93e736..b61776b 100644
--- a/pkg/driver/mounter_seaweedfs.go
+++ b/pkg/driver/mounter_seaweedfs.go
@@ -8,18 +8,20 @@ import (
 
 // Implements Mounter
 type seaweedFsMounter struct {
-	bucketName string
-	driver     *SeaweedFsDriver
+	bucketName    string
+	driver        *SeaweedFsDriver
+	volParameters map[string]string
 }
 
 const (
 	seaweedFsCmd = "weed"
 )
 
-func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) {
+func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) {
 	return &seaweedFsMounter{
-		bucketName: bucketName,
-		driver:   driver,
+		bucketName:    bucketName,
+		driver:        driver,
+		volParameters: volParameters,
 	}, nil
 }
 
@@ -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.volParameters {
+		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))
 	}
diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go
index 0509f79..52f0835 100644
--- a/pkg/driver/nodeserver.go
+++ b/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)
+	volParameters := req.GetVolumeContext()
+
+	mounter, err := newMounter(volumeID, ns.Driver, volParameters)
 	if err != nil {
 		return nil, err
 	}
@@ -163,4 +165,4 @@ func checkMount(targetPath string) (bool, error) {
 		}
 	}
 	return notMnt, nil
-}
\ No newline at end of file
+}