feature: allow additional mfsmount options

Allow additional mfsmount options to be passwd to CSI driver.

Author: xandrus

Makefile

@@ -14,7 +14,7 @@
 
 MFS3VER=3.0.117
 MFS4VER=4.44.4
-DRIVER_VERSION ?= 0.9.5
+DRIVER_VERSION ?= 0.9.6
 MFS3TAGCE=$(DRIVER_VERSION)-$(MFS3VER)
 MFS3TAGPRO=$(DRIVER_VERSION)-$(MFS3VER)-pro
 MFS4TAGPRO=$(DRIVER_VERSION)-$(MFS4VER)-pro

cmd/moosefs-csi-plugin/main.go

@@ -33,6 +33,7 @@ func main() {
 		rootDir          = flag.String("root-dir", "/", "")
 		pluginDataDir    = flag.String("plugin-data-dir", "/", "")
 		mountPointsCount = flag.Int("mount-points-count", 1, "")
+		mfsMountOptions  = flag.String("mfs-mount-options", "", "extra options passed to mfsmount command for example mfsmd5pass=MD5")
 		sanityTestRun    = flag.Bool("sanity-test-run", false, "")
 		logLevel         = flag.Int("log-level", 5, "")
 		mfsLog           = flag.Bool("mfs-logging", true, "")
@@ -45,30 +46,30 @@ func main() {
 		log.Infof("=============== SANITY TEST ===============")
 	}
 	// this won't be logged to mfs log file
-	log.Infof("Starting new service (mode: %s; master-host: %s; master-port: %d; node-id: %s; root-dir: %s; plugin-data-dir: %s)",
-		*mode, *mfsmaster, *mfsmaster_port, *nodeId, *rootDir, *pluginDataDir)
+	log.Infof("Starting new service (mode: %s; master-host: %s; master-port: %d; mfs-mount-options %s; node-id: %s; root-dir: %s; plugin-data-dir: %s)",
+		*mode, *mfsmaster, *mfsmaster_port, *mfsMountOptions, *nodeId, *rootDir, *pluginDataDir)
 
 	var srv driver.Service
 	var err error
 	switch *mode {
 	case "node":
-		srv, err = driver.NewNodeService(*mfsmaster, *mfsmaster_port, *rootDir, *pluginDataDir, *nodeId, *mountPointsCount)
+		srv, err = driver.NewNodeService(*mfsmaster, *mfsmaster_port, *rootDir, *pluginDataDir, *nodeId, *mfsMountOptions, *mountPointsCount)
 		if err != nil {
-			log.Error("main - couldn't create node service. Error: %s", err.Error())
+			log.Errorf("main - couldn't create node service. Error: %s", err.Error())
 			return
 		}
 	case "controller":
-		srv, err = driver.NewControllerService(*mfsmaster, *mfsmaster_port, *rootDir, *pluginDataDir)
+		srv, err = driver.NewControllerService(*mfsmaster, *mfsmaster_port, *rootDir, *pluginDataDir, *mfsMountOptions)
 		if err != nil {
-			log.Error("main - couldn't create controller service. Error: %s", err.Error())
+			log.Errorf("main - couldn't create controller service. Error: %s", err.Error())
 			return
 		}
 	default:
-		log.Error("main - unrecognized mode = %s", *mode)
+		log.Errorf("main - unrecognized mode = %s", *mode)
 		return
 	}
 
 	if err = driver.StartService(&srv, *mode, *csiEndpoint); err != nil {
-		log.Error("main - couldn't start service %s", err.Error())
+		log.Errorf("main - couldn't start service %s", err.Error())
 	}
 }

deploy/kubernetes/csi-moosefs-config.yaml

@@ -4,12 +4,16 @@ metadata:
   namespace: kube-system
   name: csi-moosefs-config
 data:
-  master_host: "192.168.40.0"           # domain name is recommended, this IP is only an example
-  master_port: "19421"
-# master_host: "172.17.2.80"
-# master_port: "9421"
-  k8s_root_dir: "/"                     # MooseFS root directory for all claims within this Kubernetes cluster
-  driver_working_dir: "pv_data"         # MooseFS directory (relative to csi_root_dir) for all driver data
-                                        # (effective working dir will be calculated as k8s_root_dir/driver_working_dir)
-  mount_count: "1"                      # Number of pre-created MooseFS mounts on each node
-  mfs_logging: "true"                   # Should driver log to k8s_root_dir/driver_working_dir/logs directory
+  # MooseFS master hostname or IP
+  master_host: "mfsmaster"
+  # MooseFS master port
+  master_port: "9421"
+  # MooseFS root directory for all claims within this Kubernetes cluster
+  k8s_root_dir: "/"
+  # MooseFS directory (relative to csi_root_dir) for all driver data.
+  # Effective working dir will be mapped to k8s_root_dir/driver_working_dir
+  driver_working_dir: "pv_data"
+  # Number of pre-created MooseFS mounts on each node
+  mount_count: "1"
+  # Should driver log to k8s_root_dir/driver_working_dir/logs directory
+  mfs_logging: "true"

deploy/kubernetes/with-mfsmaster-password/csi-moosefs-config.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: kube-system
+  name: csi-moosefs-config
+data:
+  # MooseFS master hostname or IP
+  master_host: "mfsmaster"
+  # MooseFS master port
+  master_port: "9421"
+  # MooseFS root directory for all claims within this Kubernetes cluster
+  k8s_root_dir: "/"
+  # MooseFS directory (relative to csi_root_dir) for all driver data
+  # (effective working dir will be calculated as k8s_root_dir/driver_working_dir)
+  driver_working_dir: "pv_data"
+  # Number of pre-created MooseFS mounts on each node
+  mount_count: "1"
+  # Should driver log to k8s_root_dir/driver_working_dir/logs directory
+  mfs_logging: "true"
+  # Additional mfsmount options
+  mfs_mount_options: "mfsmd5pass=[MD5 hash]"