fix: fix the bug due to vendor update

Signed-off-by: ZeroMagic <[email protected]>

Author: ZeroMagic

pkg/blobfuse/blobfuse.go

@@ -26,9 +26,10 @@ import (
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
 	"k8s.io/klog"
-	"k8s.io/utils/mount"
 	k8sutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/azure"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 )
 
 const (
@@ -89,7 +90,7 @@ func (d *Driver) Run(endpoint, kubeconfig string) {
 
 	d.mounter = &mount.SafeFormatAndMount{
 		Interface: mount.New(""),
-		Exec:      mount.NewOsExec(),
+		Exec:      utilexec.New(),
 	}
 
 	// Initialize default library driver

pkg/blobfuse/controllerserver.go

@@ -83,7 +83,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	if strings.HasPrefix(strings.ToLower(storageAccountType), "premium") {
 		accountKind = string(storage.BlockBlobStorage)
 	}
-	account, accountKey, err := d.cloud.EnsureStorageAccount(accountName, storageAccountType, accountKind, resourceGroup, location, blobfuseAccountNamePrefix)
+	account, accountKey, err := d.cloud.EnsureStorageAccount(accountName, storageAccountType, accountKind, resourceGroup, location, blobfuseAccountNamePrefix, false)
 	if err != nil {
 		return nil, fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err)
 	}

pkg/blobfuse/nodeserver.go

@@ -23,11 +23,13 @@ import (
 	"os/exec"
 	"strings"
 
+	volumehelper "sigs.k8s.io/blobfuse-csi-driver/pkg/util"
+
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
 	"k8s.io/klog"
-	"k8s.io/utils/mount"
 	"k8s.io/kubernetes/pkg/volume/util"
+	"k8s.io/utils/mount"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -267,7 +269,7 @@ func (d *Driver) ensureMountPoint(target string) error {
 		// notMnt = true
 	}
 
-	if err := d.mounter.MakeDir(target); err != nil {
+	if err := volumehelper.MakeDir(target); err != nil {
 		klog.Errorf("MakeDir failed on target: %s (%v)", target, err)
 		return err
 	}

pkg/util/util.go

@@ -16,6 +16,10 @@ limitations under the License.
 
 package util
 
+import (
+	"os"
+)
+
 const (
 	GiB = 1024 * 1024 * 1024
 )
@@ -66,3 +70,13 @@ func GetMountOptions(options []string) string {
 	}
 	return str
 }
+
+func MakeDir(pathname string) error {
+	err := os.MkdirAll(pathname, os.FileMode(0755))
+	if err != nil {
+		if !os.IsExist(err) {
+			return err
+		}
+	}
+	return nil
+}