Merge pull request #2020 from kubernetes-sigs/revert-1998-cherry-pick-1994-to-release-1.25

Revert "[release-1.25] cleanup: disable version check in blobfuse2 driver by default"

Author: andyzhangx

pkg/blob/blob.go

@@ -1033,8 +1033,7 @@ func appendDefaultMountOptions(mountOptions []string, tmpPath, containerName str
 		// prevent billing charges on mounting
 		"--cancel-list-on-mount-seconds": "10",
 		// allow remounting using a non-empty tmp-path
-		"--empty-dir-check":       "false",
-		"--disable-version-check": "true",
+		"--empty-dir-check": "false",
 	}
 
 	// stores the mount options already included in mountOptions

pkg/blob/blob_test.go

@@ -1405,7 +1405,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			containerName: "containerName",
 			expected: []string{"--cancel-list-on-mount-seconds=10",
 				"--container-name=containerName",
-				"--disable-version-check=true",
 				"--pre-mount-validate=true",
 				"--empty-dir-check=false",
 				"--tmp-path=/tmp",
@@ -1419,7 +1418,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			containerName: "containerName",
 			expected: []string{"--cancel-list-on-mount-seconds=0",
 				"--container-name=containerName",
-				"--disable-version-check=true",
 				"--pre-mount-validate=false",
 				"--empty-dir-check=false",
 				"--tmp-path=/tmp",
@@ -1433,28 +1431,13 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			containerName: "containerName",
 			expected: []string{"--cancel-list-on-mount-seconds=10",
 				"--container-name=containerName",
-				"--disable-version-check=true",
 				"--pre-mount-validate=false",
 				"--empty-dir-check=false",
 				"--tmp-path=/var/log",
 				"--use-https=true",
 				"targetPath",
 			},
 		},
-		{
-			options:       []string{"targetPath", "--tmp-path=/var/log", "--disable-version-check=false"},
-			tmpPath:       "/tmp",
-			containerName: "containerName",
-			expected: []string{"--cancel-list-on-mount-seconds=10",
-				"--container-name=containerName",
-				"--disable-version-check=false",
-				"--pre-mount-validate=true",
-				"--empty-dir-check=false",
-				"--tmp-path=/var/log",
-				"--use-https=true",
-				"targetPath",
-			},
-		},
 	}
 
 	for _, test := range tests {