Merge pull request #246 from andyzhangx/bring-key-fix

fix: mount failure in bring key scenario

Author: andyzhangx

pkg/blob/blob.go

@@ -54,6 +54,7 @@ const (
 	tagsField                = "tags"
 	protocolField            = "protocol"
 	secretNamespaceField     = "secretnamespace"
+	containerNameField       = "containername"
 	storeAccountKeyField     = "storeaccountkey"
 	storeAccountKeyFalse     = "false"
 	defaultSecretAccountName = "azurestorageaccountname"
@@ -255,7 +256,7 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID string, attrib, secret
 
 	for k, v := range attrib {
 		switch strings.ToLower(k) {
-		case "containername":
+		case containerNameField:
 			containerName = v
 		case "keyvaulturl":
 			keyVaultURL = v
@@ -373,7 +374,7 @@ func (d *Driver) GetStorageAccountAndContainer(ctx context.Context, volumeID str
 
 	for k, v := range attrib {
 		switch strings.ToLower(k) {
-		case "containername":
+		case containerNameField:
 			containerName = v
 		case "keyvaulturl":
 			keyVaultURL = v
@@ -518,20 +519,19 @@ func setAzureCredentials(kubeClient kubernetes.Interface, accountName, accountKe
 	return secretName, err
 }
 
-// GetStorageAccesskey get Azure storage account key
-func (d *Driver) GetStorageAccesskey(accountOptions *azure.AccountOptions, secrets map[string]string, secretNamespace string) (string, error) {
+// GetStorageAccesskey get Azure storage (account name, account key)
+func (d *Driver) GetStorageAccesskey(accountOptions *azure.AccountOptions, secrets map[string]string, secretNamespace string) (string, string, error) {
 	if len(secrets) > 0 {
-		_, accountKey, err := getStorageAccount(secrets)
-		return accountKey, err
+		return getStorageAccount(secrets)
 	}
 
 	// read from k8s secret first
 	accountKey, err := d.GetStorageAccesskeyFromSecret(accountOptions.Name, secretNamespace)
 	if err != nil {
 		klog.V(2).Infof("could not get account(%s) key from secret, error: %v, use cluster identity to get account key instead", accountOptions.Name, err)
-		return d.cloud.GetStorageAccesskey(accountOptions.Name, accountOptions.ResourceGroup)
+		accountKey, err = d.cloud.GetStorageAccesskey(accountOptions.Name, accountOptions.ResourceGroup)
 	}
-	return accountKey, err
+	return accountOptions.Name, accountKey, err
 }
 
 // GetStorageAccesskeyFromSecret get storage account key from k8s secret

pkg/blob/controllerserver.go

@@ -53,6 +53,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	requestGiB := int(util.RoundUpGiB(volSizeBytes))
 
 	parameters := req.GetParameters()
+	if parameters == nil {
+		parameters = make(map[string]string)
+	}
 	var storageAccountType, resourceGroup, location, account, containerName, protocol, customTags, storeAccountKey, secretNamespace string
 
 	// Apply ProvisionerParameters (case-insensitive). We leave validation of
@@ -69,7 +72,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 			account = v
 		case "resourcegroup":
 			resourceGroup = v
-		case "containername":
+		case containerNameField:
 			containerName = v
 		case protocolField:
 			protocol = v
@@ -146,13 +149,14 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	accountOptions.Name = accountName
 
 	if accountKey == "" {
-		if accountKey, err = d.GetStorageAccesskey(accountOptions, req.GetSecrets(), secretNamespace); err != nil {
+		if accountName, accountKey, err = d.GetStorageAccesskey(accountOptions, req.GetSecrets(), secretNamespace); err != nil {
 			return nil, fmt.Errorf("failed to GetStorageAccesskey on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)
 		}
 	}
 
 	if containerName == "" {
 		containerName = getValidContainerName(name, protocol)
+		parameters[containerNameField] = containerName
 	}
 
 	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)