Merge pull request #409 from humblec/mount-options

Add mount options support in CephFS CSI driver

examples/cephfs/storageclass.yaml

@@ -34,3 +34,5 @@ parameters:
   # --volumemounter command-line argument.
   # mounter: kernel
 reclaimPolicy: Delete
+mountOptions:
+  - noexec

pkg/cephfs/mountcache.go

@@ -136,9 +136,11 @@ func mountOneCacheEntry(volOptions *volumeOptions, vid *volumeIdentifier, me *vo
 			return err
 		}
 	}
+
+	mountOptions := []string{"bind"}
 	for targetPath, readOnly := range me.TargetPaths {
 		if err := cleanupMountPoint(targetPath); err == nil {
-			if err := bindMount(me.StagingPath, targetPath, readOnly); err != nil {
+			if err := bindMount(me.StagingPath, targetPath, readOnly, mountOptions); err != nil {
 				klog.Errorf("mount-cache: failed to bind-mount volume %s: %s %s %v %v",
 					volID, me.StagingPath, targetPath, readOnly, err)
 			} else {

pkg/cephfs/nodeserver.go

@@ -178,6 +178,8 @@ func (*NodeServer) mount(volOptions *volumeOptions, req *csi.NodeStageVolumeRequ
 // NodePublishVolume mounts the volume mounted to the staging path to the target
 // path
 func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
+
+	mountOptions := []string{"bind"}
 	if err := validateNodePublishVolumeRequest(req); err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
@@ -192,6 +194,28 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
+	volCap := req.GetVolumeCapability()
+
+	if req.GetReadonly() {
+		mountOptions = append(mountOptions, "ro")
+	}
+
+	if m := volCap.GetMount(); m != nil {
+		hasOption := func(options []string, opt string) bool {
+			for _, o := range options {
+				if o == opt {
+					return true
+				}
+			}
+			return false
+		}
+		for _, f := range m.MountFlags {
+			if !hasOption(mountOptions, f) {
+				mountOptions = append(mountOptions, f)
+			}
+		}
+	}
+
 	// Check if the volume is already mounted
 
 	isMnt, err := isMountPoint(targetPath)
@@ -208,7 +232,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 
 	// It's not, mount now
 
-	if err = bindMount(req.GetStagingTargetPath(), req.GetTargetPath(), req.GetReadonly()); err != nil {
+	if err = bindMount(req.GetStagingTargetPath(), req.GetTargetPath(), req.GetReadonly(), mountOptions); err != nil {
 		klog.Errorf("failed to bind-mount volume %s: %v", volID, err)
 		return nil, status.Error(codes.Internal, err.Error())
 	}

pkg/cephfs/volumemounter.go

@@ -23,6 +23,7 @@ import (
 	"os/exec"
 	"regexp"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/ceph/ceph-csi/pkg/util"
@@ -194,13 +195,15 @@ func (m *kernelMounter) mount(mountPoint string, cr *credentials, volOptions *vo
 
 func (m *kernelMounter) name() string { return "Ceph kernel client" }
 
-func bindMount(from, to string, readOnly bool) error {
+func bindMount(from, to string, readOnly bool, mntOptions []string) error {
-	if err := execCommandErr("mount", "--bind", from, to); err != nil {
+	mntOptionSli := strings.Join(mntOptions, ",")
+	if err := execCommandErr("mount", "-o", mntOptionSli, from, to); err != nil {
 		return fmt.Errorf("failed to bind-mount %s to %s: %v", from, to, err)
 	}
 
 	if readOnly {
-		if err := execCommandErr("mount", "-o", "remount,ro,bind", to); err != nil {
+		mntOptionSli = mntOptionSli + ",remount"
+		if err := execCommandErr("mount", "-o", mntOptionSli, to); err != nil {
 			return fmt.Errorf("failed read-only remount of %s: %v", to, err)
 		}
 	}