Merge pull request #631 from kubernetes-sigs/smb-version-negotiate

feat: negotiate smb version
kubernetes-sigs · Apr 29, 2021 · 6d44804 · 6d44804
2 parents ed10001 + e3fd82d
commit 6d44804
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/pkg/azurefile/azurefile.go b/pkg/azurefile/azurefile.go
@@ -58,12 +58,10 @@ const (
 	subnetTemplate     = "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworks/%s/subnets/%s"
 	fileMode           = "file_mode"
 	dirMode            = "dir_mode"
-	vers               = "vers"
 	actimeo            = "actimeo"
 	mfsymlinks         = "mfsymlinks"
 	defaultFileMode    = "0777"
 	defaultDirMode     = "0777"
-	defaultVers        = "3.0"
 	defaultActimeo     = "30"
 
 	// See https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-shares--directories--files--and-metadata#share-names
@@ -302,7 +300,6 @@ func appendDefaultMountOptions(mountOptions []string) []string {
 	var defaultMountOptions = map[string]string{
 		fileMode:   defaultFileMode,
 		dirMode:    defaultDirMode,
-		vers:       defaultVers,
 		actimeo:    defaultActimeo,
 		mfsymlinks: "",
 	}

diff --git a/pkg/azurefile/azurefile_test.go b/pkg/azurefile/azurefile_test.go
@@ -70,7 +70,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			options: []string{"dir_mode=0777"},
 			expected: []string{"dir_mode=0777",
 				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 				mfsymlinks,
 			},
@@ -79,7 +78,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			options: []string{"file_mode=0777"},
 			expected: []string{"file_mode=0777",
 				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 				mfsymlinks,
 			},
@@ -97,7 +95,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			options: []string{"file_mode=0777", "dir_mode=0777"},
 			expected: []string{
 				"file_mode=0777", "dir_mode=0777",
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 				mfsymlinks,
 			},
@@ -108,7 +105,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 				"actimeo=3",
 				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
 				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				mfsymlinks,
 			},
 		},
@@ -118,15 +114,14 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 				mfsymlinks,
 				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
 				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 			},
 		},
 		{
 			options: []string{"vers=3.1.1"},
 			expected: []string{"dir_mode=0777",
 				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
-				fmt.Sprintf("%s=%s", vers, "3.1.1"),
+				fmt.Sprintf("%s=%s", "vers", "3.1.1"),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 				mfsymlinks,
 			},
@@ -136,7 +131,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			expected: []string{"", fmt.Sprintf("%s=%s",
 				fileMode, defaultFileMode),
 				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers),
 				fmt.Sprintf("%s=%s", actimeo, defaultActimeo),
 				mfsymlinks,
 			},