merge#53629: fix azure file mount limit issue on windows due to using…

… drive letter (kubernetes#22)
andyzhangx · May 16, 2018 · 523d109 · 523d109
1 parent 6ee230d
commit 523d109
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/pkg/util/mount/mount_windows.go b/pkg/util/mount/mount_windows.go
@@ -85,12 +85,8 @@ func (mounter *Mounter) Mount(source string, target string, fstype string, optio
 			`$Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $User, $PWord`,
 			options[0], options[1])
 
-		driverLetter, err := getAvailableDriveLetter()
-		if err != nil {
-			return err
-		}
-		bindSource = driverLetter + ":"
-		cmdLine += fmt.Sprintf(";New-SmbGlobalMapping -LocalPath %s -RemotePath %s -Credential $Credential", bindSource, source)
+		bindSource = source
+		cmdLine += fmt.Sprintf(";New-SmbGlobalMapping -RemotePath %s -Credential $Credential", source)
 
 		if output, err := exec.Command("powershell", "/c", cmdLine).CombinedOutput(); err != nil {
 			// we don't return error here, even though New-SmbGlobalMapping failed, we still make it successful,
@@ -354,20 +350,6 @@ func normalizeWindowsPath(path string) string {
 	return normalizedPath
 }
 
-func getAvailableDriveLetter() (string, error) {
-	cmd := "$used = Get-PSDrive | Select-Object -Expand Name | Where-Object { $_.Length -eq 1 }"
-	cmd += ";$drive = 67..90 | ForEach-Object { [string][char]$_ } | Where-Object { $used -notcontains $_ } | Select-Object -First 1;$drive"
-	output, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
-	if err != nil {
-		return "", fmt.Errorf("getAvailableDriveLetter failed: %v, output: %q", err, string(output))
-	}
-
-	if len(output) == 0 {
-		return "", fmt.Errorf("azureMount: there is no available drive letter now")
-	}
-	return string(output)[:1], nil
-}
-
 // ValidateDiskNumber : disk number should be a number in [0, 99]
 func ValidateDiskNumber(disk string) error {
 	diskNum, err := strconv.Atoi(disk)

diff --git a/pkg/util/mount/mount_windows_test.go b/pkg/util/mount/mount_windows_test.go
@@ -24,8 +24,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestNormalizeWindowsPath(t *testing.T) {