fix: use new naming rule for nfs container

Author: andyzhangx

docs/driver-parameters.md

@@ -15,7 +15,7 @@ location | Azure location | `eastus`, `westus`, etc. | No | if empty, driver wil
 resourceGroup | Azure resource group name | existing resource group name | No | if empty, driver will use the same resource group name as current k8s cluster
 storageAccount | specify Azure storage account name| STORAGE_ACCOUNT_NAME | - No for blobfuse mount </br> - Yes for NFSv3 mount |  - For blobfuse mount: if empty, driver will find a suitable storage account that matches `skuName` in the same resource group; if a storage account name is provided, storage account must exist. </br>  - For NFSv3 mount, storage account name must be provided
 protocol | specify blobfuse mount or NFSv3 mount | `fuse`, `nfs` | No | `fuse`
-containerName | specify the existing container name | existing container name | No | if empty, driver will create a new container name, starting with `pvc-fuse`
+containerName | specify the existing container name | existing container name | No | if empty, driver will create a new container name, starting with `pvc-fuse` for blobfuse or `pvc-nfs` for NFSv3
 server | specify Azure storage account server address | existing server address, e.g. `accountname.privatelink.blob.core.windows.net` | No | if empty, driver will use default `accountname.blob.core.windows.net` or other sovereign cloud account address
 tags | [tags](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources) would be created in newly created storage account | tag format: 'foo=aaa,bar=bbb' | No | ""
 

pkg/blob/blobfuse.go

@@ -191,15 +191,15 @@ func appendDefaultMountOptions(mountOptions []string) []string {
 //	4. Container names must be from 3 through 63 characters long.
 //
 // See https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names
-func getValidContainerName(volumeName string) string {
+func getValidContainerName(volumeName, protocol string) string {
 	containerName := strings.ToLower(volumeName)
 	if len(containerName) > containerNameMaxLength {
 		containerName = containerName[0:containerNameMaxLength]
 	}
 	if !checkContainerNameBeginAndEnd(containerName) || len(containerName) < containerNameMinLength {
 		// now we set as 63 for maximum container name length
 		// todo: get cluster name
-		containerName = k8sutil.GenerateVolumeName("pvc-fuse", uuid.NewUUID().String(), 63)
+		containerName = k8sutil.GenerateVolumeName(fmt.Sprintf("pvc-%s", protocol), uuid.NewUUID().String(), 63)
 		klog.Warningf("the requested volume name (%q) is invalid, so it is regenerated as (%q)", volumeName, containerName)
 	}
 	containerName = strings.Replace(containerName, "--", "-", -1)

pkg/blob/blobfuse_test.go

@@ -187,6 +187,7 @@ func TestIsRetriableError(t *testing.T) {
 func TestGetValidContainerName(t *testing.T) {
 	tests := []struct {
 		volumeName string
+		protocol   string
 		expected   string
 	}{
 		{
@@ -212,7 +213,7 @@ func TestGetValidContainerName(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		result := getValidContainerName(test.volumeName)
+		result := getValidContainerName(test.volumeName, "")
 		if !reflect.DeepEqual(result, test.expected) {
 			t.Errorf("input: %q, getValidContainerName result: %q, expected: %q", test.volumeName, result, test.expected)
 		}

pkg/blob/controllerserver.go

@@ -84,6 +84,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		resourceGroup = d.cloud.ResourceGroup
 	}
 
+	if protocol == "" {
+		protocol = fuse
+	}
 	if !isSupportedProtocol(protocol) {
 		return nil, status.Errorf(codes.InvalidArgument, "protocol(%s) is not supported, supported protocol list: %v", protocol, supportedProtocolList)
 	}
@@ -132,7 +135,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	}
 
 	if containerName == "" {
-		containerName = getValidContainerName(name)
+		containerName = getValidContainerName(name, protocol)
 	}
 
 	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)