Merge pull request #896 from k8s-infra-cherrypick-robot/cherry-pick-893-to-release-1.21

[release-1.21] fix: mount failure when mountOptions is empty

Author: k8s-ci-robot

pkg/blob/nodeserver.go

@@ -173,6 +173,8 @@ func (d *Driver) mountBlobfuseWithProxy(args, protocol string, authEnv []string)
 func (d *Driver) mountBlobfuseInsideDriver(args string, protocol string, authEnv []string) (string, error) {
 	var cmd *exec.Cmd
 
+	args = volumehelper.TrimDuplicatedSpace(args)
+
 	mountLog := "mount inside driver with"
 	if protocol == Fuse2 {
 		mountLog += " v2"

pkg/blobfuse-proxy/server/server.go

@@ -76,9 +76,11 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
 			klog.V(2).Infof("append --ignore-open-flags=true to mount args")
 			args = args + " " + "--ignore-open-flags=true"
 		}
+		args = util.TrimDuplicatedSpace(args)
 		klog.V(2).Infof("mount with v2, protocol: %s, args: %s", protocol, args)
 		cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
 	} else {
+		args = util.TrimDuplicatedSpace(args)
 		klog.V(2).Infof("mount with v1, protocol: %s, args: %s", protocol, args)
 		cmd = exec.Command("blobfuse", strings.Split(args, " ")...)
 	}

pkg/util/util.go

@@ -19,6 +19,7 @@ package util
 import (
 	"fmt"
 	"os"
+	"regexp"
 	"strings"
 	"sync"
 
@@ -183,3 +184,9 @@ func GetOSInfo(f interface{}) (*OsInfo, error) {
 	klog.V(2).Infof("get OS info: %v", oi)
 	return oi, nil
 }
+
+func TrimDuplicatedSpace(s string) string {
+	reg := regexp.MustCompile(`\s+`)
+	s = reg.ReplaceAllString(s, " ")
+	return s
+}

pkg/util/util_test.go

@@ -293,3 +293,30 @@ func TestGetOSInfo(t *testing.T) {
 		})
 	}
 }
+
+func TestTrimDuplicatedSpace(t *testing.T) {
+	type args struct {
+		s string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			// ignore spell lint error
+			name: "trim duplicated space",
+			args: args{
+				s: "  12 3   456  ",
+			},
+			want: " 12 3 456 ",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := TrimDuplicatedSpace(tt.args.s); got != tt.want {
+				t.Errorf("TrimDuplicatedSpace() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}