Merge pull request #32 from csi-driver/mountoptions

add mountOptions and readOnly support

Author: andyzhangx

pkg/blobfuse/controllerserver.go

@@ -21,12 +21,12 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/kubernetes/pkg/volume/util"
+	k8sutil "k8s.io/kubernetes/pkg/volume/util"
 
 	"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
 	azstorage "github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	volumehelper "github.com/csi-driver/blobfuse-csi-driver/pkg/util"
+	"github.com/csi-driver/blobfuse-csi-driver/pkg/util"
 	"github.com/pborman/uuid"
 	"k8s.io/klog"
 
@@ -53,7 +53,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	}
 
 	volSizeBytes := int64(req.GetCapacityRange().GetRequiredBytes())
-	requestGiB := int(volumehelper.RoundUpGiB(volSizeBytes))
+	requestGiB := int(util.RoundUpGiB(volSizeBytes))
 
 	parameters := req.GetParameters()
 	var storageAccountType, resourceGroup, location, accountName, containerName string
@@ -92,7 +92,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	if containerName == "" {
 		// now we set as 63 for maximum container name length
 		// todo: get cluster name
-		containerName = util.GenerateVolumeName("pvc-fuse", uuid.NewUUID().String(), 63)
+		containerName = k8sutil.GenerateVolumeName("pvc-fuse", uuid.NewUUID().String(), 63)
 	}
 
 	klog.V(2).Infof("begin to create container(%s) on account(%s) type(%s) rg(%s) location(%s) size(%d)", containerName, accountName, storageAccountType, resourceGroup, location, requestGiB)

pkg/blobfuse/nodeserver.go

@@ -24,7 +24,9 @@ import (
 	"strings"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/csi-driver/blobfuse-csi-driver/pkg/util"
 	"k8s.io/klog"
+	k8sutil "k8s.io/kubernetes/pkg/volume/util"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -114,8 +116,15 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 		}
 	}
 
-	// todo: user could set tmp-path and other mountOptions
-	cmd := exec.Command("/usr/blob/blobfuse", targetPath, "--tmp-path=/mnt/"+volumeID, "--container-name="+containerName)
+	// "allow_other" option refer to http://manpages.ubuntu.com/manpages/xenial/man8/mount.fuse.8.html
+	options := []string{"-o allow_other"}
+	if readOnly {
+		options = append(options, "-o ro")
+	}
+	mountOptions := k8sutil.JoinMountOptions(mountFlags, options)
+
+	cmd := exec.Command("/usr/blob/blobfuse", targetPath, "--tmp-path=/mnt/"+volumeID,
+		"--container-name="+containerName, util.GetMountOptions(mountOptions))
 	cmd.Env = append(os.Environ(), "AZURE_STORAGE_ACCOUNT="+accountName, "AZURE_STORAGE_ACCESS_KEY="+accountKey)
 	err = cmd.Run()
 	if err != nil {

pkg/util/util.go

@@ -54,3 +54,15 @@ func roundUpSize(volumeSizeBytes int64, allocationUnitBytes int64) int64 {
 	}
 	return roundedUp
 }
+
+// GetMountOptions return options with string list seperated by space
+func GetMountOptions(options []string) string {
+	if len(options) == 0 {
+		return ""
+	}
+	str := options[0]
+	for i := 1; i < len(options); i++ {
+		str = str + " " + options[i]
+	}
+	return str
+}

pkg/util/util_test.go

@@ -53,3 +53,30 @@ func TestGiBToBytes(t *testing.T) {
 		t.Fatalf("Wrong result for GiBToBytes. Got: %d", actual)
 	}
 }
+
+func TestGetMountOptions(t *testing.T) {
+	tests := []struct {
+		options  []string
+		expected string
+	}{
+		{
+			options:  []string{"-o allow_other", "-o ro", "--use-https=true"},
+			expected: "-o allow_other -o ro --use-https=true",
+		},
+		{
+			options:  []string{"-o allow_other"},
+			expected: "-o allow_other",
+		},
+		{
+			options:  []string{""},
+			expected: "",
+		},
+	}
+
+	for _, test := range tests {
+		result := GetMountOptions(test.options)
+		if result != test.expected {
+			t.Errorf("getMountOptions(%v) result: %s, expected: %s", test.options, result, test.expected)
+		}
+	}
+}