Merge pull request #456 from andyzhangx/ephemeralVolMountOptions

feat: add mountOptions for inline volume

Author: andyzhangx

deploy/example/e2e_usage.md

@@ -92,7 +92,7 @@ spec:
   csi:
     driver: blob.csi.azure.com
     readOnly: false
-    volumeHandle: uniqe-volumeid  # make sure this volumeid is unique in the cluster
+    volumeHandle: unique-volumeid  # make sure this volumeid is unique in the cluster
     volumeAttributes:
       containerName: EXISTING_CONTAINER_NAME
     nodeStageSecretRef:

deploy/example/nginx-blobfuse-inline-volume.yaml

@@ -23,3 +23,4 @@ spec:
         volumeAttributes:
           containerName: EXISTING_CONTAINER_NAME
           secretName: azure-secret
+          mountOptions: "-o allow_other --file-cache-timeout-in-seconds=120"

deploy/example/pv-blobfuse-auth.yaml

@@ -15,7 +15,9 @@ spec:
   csi:
     driver: blob.csi.azure.com
     readOnly: false
-    volumeHandle: uniqe-volumeid  # make sure this volumeid is unique in the cluster
+    # make sure this volumeid is unique in the cluster
+    # `#` is not allowed in self defined volumeHandle
+    volumeHandle: unique-volumeid
     volumeAttributes:
       resourceGroup: EXISTING_RESOURCE_GROUP_NAME
       storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

deploy/example/pv-blobfuse-csi-keyvault.yaml

@@ -12,7 +12,9 @@ spec:
   csi:
     driver: blob.csi.azure.com
     readOnly: false
-    volumeHandle: arbitrary-volumeid
+    # make sure this volumeid is unique in the cluster
+    # `#` is not allowed in self defined volumeHandle
+    volumeHandle: unique-volumeid
     volumeAttributes:
       containerName: EXISTING_CONTAINER_NAME
       storageAccountName: EXISTING_STORAGE_ACCOUNT_NAME

deploy/example/pv-blobfuse-csi.yaml

@@ -15,7 +15,9 @@ spec:
   csi:
     driver: blob.csi.azure.com
     readOnly: false
-    volumeHandle: uniqe-volumeid  # make sure this volumeid is unique in the cluster
+    # make sure this volumeid is unique in the cluster
+    # `#` is not allowed in self defined volumeHandle
+    volumeHandle: unique-volumeid
     volumeAttributes:
       resourceGroup: EXISTING_RESOURCE_GROUP_NAME
       storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

deploy/example/pv-blobfuse-nfs.yaml

@@ -12,7 +12,9 @@ spec:
   csi:
     driver: blob.csi.azure.com
     readOnly: false
-    volumeHandle: uniqe-volumeid  # make sure this volumeid is unique in the cluster
+    # make sure this volumeid is unique in the cluster
+    # `#` is not allowed in self defined volumeHandle
+    volumeHandle: unique-volumeid
     volumeAttributes:
       resourceGroup: EXISTING_RESOURCE_GROUP_NAME
       storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

pkg/blob/blob.go

@@ -66,6 +66,9 @@ const (
 	keyVaultSecretNameField      = "keyvaultsecretname"
 	keyVaultSecretVersionField   = "keyvaultsecretversion"
 	storageAccountNameField      = "storageaccountname"
+	ephemeralField               = "csi.storage.k8s.io/ephemeral"
+	podNamespaceField            = "csi.storage.k8s.io/pod.namespace"
+	mountOptionsField            = "mountoptions"
 	falseValue                   = "false"
 	trueValue                    = "true"
 	defaultSecretAccountName     = "azurestorageaccountname"
@@ -270,9 +273,7 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
 		case secretNamespaceField:
 			secretNamespace = v
 		case getAccountKeyFromSecretField:
-			if v == trueValue {
-				getAccountKeyFromSecret = true
-			}
+			getAccountKeyFromSecret = strings.EqualFold(v, trueValue)
 		case "azurestorageauthtype":
 			authEnv = append(authEnv, "AZURE_STORAGE_AUTH_TYPE="+v)
 		case "azurestorageidentityclientid":

pkg/blob/controllerserver.go

@@ -93,7 +93,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		case secretNamespaceField:
 			secretNamespace = v
 		case storeAccountKeyField:
-			if v == falseValue {
+			if strings.EqualFold(v, falseValue) {
 				storeAccountKey = false
 			}
 		case pvcNamespaceKey:

pkg/blob/nodeserver.go

@@ -69,8 +69,8 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 	}
 
 	context := req.GetVolumeContext()
-	if context != nil && context["csi.storage.k8s.io/ephemeral"] == trueValue {
-		context[secretNamespaceField] = context["csi.storage.k8s.io/pod.namespace"]
+	if context != nil && strings.EqualFold(context[ephemeralField], trueValue) {
+		context[secretNamespaceField] = context[podNamespaceField]
 		// only get storage account from secret
 		context[getAccountKeyFromSecretField] = trueValue
 		context[storageAccountField] = ""
@@ -210,7 +210,8 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	attrib := req.GetVolumeContext()
 	secrets := req.GetSecrets()
 
-	var serverAddress, storageEndpointSuffix, protocol string
+	var serverAddress, storageEndpointSuffix, protocol, ephemeralVolMountOptions string
+	var ephemeralVol bool
 	for k, v := range attrib {
 		switch strings.ToLower(k) {
 		case serverNameField:
@@ -219,6 +220,10 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 			protocol = v
 		case storageEndpointSuffixField:
 			storageEndpointSuffix = v
+		case ephemeralField:
+			ephemeralVol = strings.EqualFold(v, trueValue)
+		case mountOptionsField:
+			ephemeralVolMountOptions = v
 		}
 	}
 
@@ -263,6 +268,9 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 
 	// Get mountOptions that the volume will be formatted and mounted with
 	mountOptions := util.JoinMountOptions(mountFlags, []string{"--use-https=true"})
+	if ephemeralVol {
+		mountOptions = util.JoinMountOptions(mountOptions, []string{ephemeralVolMountOptions})
+	}
 
 	// set different tmp-path with time info
 	tmpPath := fmt.Sprintf("%s/%s#%d", "/mnt", volumeID, time.Now().Unix())

test/e2e/testsuites/testsuites.go

@@ -545,6 +545,7 @@ func (t *TestPod) SetupInlineVolume(name, mountPath, secretName, containerName s
 					"secretName":      secretName,
 					"secretNamespace": "default",
 					"containerName":   containerName,
+					"mountOptions":    "-o allow_other --file-cache-timeout-in-seconds=240",
 				},
 				ReadOnly: to.BoolPtr(readOnly),
 			},