Skip to content

Commit 7e44469

Browse files
authored
Revert "[release-1.25] cleanup: disable version check in blobfuse2 driver by default"
1 parent 02db258 commit 7e44469

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

pkg/blob/blob.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,8 +1033,7 @@ func appendDefaultMountOptions(mountOptions []string, tmpPath, containerName str
10331033
// prevent billing charges on mounting
10341034
"--cancel-list-on-mount-seconds": "10",
10351035
// allow remounting using a non-empty tmp-path
1036-
"--empty-dir-check": "false",
1037-
"--disable-version-check": "true",
1036+
"--empty-dir-check": "false",
10381037
}
10391038

10401039
// stores the mount options already included in mountOptions

pkg/blob/blob_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14051405
containerName: "containerName",
14061406
expected: []string{"--cancel-list-on-mount-seconds=10",
14071407
"--container-name=containerName",
1408-
"--disable-version-check=true",
14091408
"--pre-mount-validate=true",
14101409
"--empty-dir-check=false",
14111410
"--tmp-path=/tmp",
@@ -1419,7 +1418,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14191418
containerName: "containerName",
14201419
expected: []string{"--cancel-list-on-mount-seconds=0",
14211420
"--container-name=containerName",
1422-
"--disable-version-check=true",
14231421
"--pre-mount-validate=false",
14241422
"--empty-dir-check=false",
14251423
"--tmp-path=/tmp",
@@ -1433,28 +1431,13 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14331431
containerName: "containerName",
14341432
expected: []string{"--cancel-list-on-mount-seconds=10",
14351433
"--container-name=containerName",
1436-
"--disable-version-check=true",
14371434
"--pre-mount-validate=false",
14381435
"--empty-dir-check=false",
14391436
"--tmp-path=/var/log",
14401437
"--use-https=true",
14411438
"targetPath",
14421439
},
14431440
},
1444-
{
1445-
options: []string{"targetPath", "--tmp-path=/var/log", "--disable-version-check=false"},
1446-
tmpPath: "/tmp",
1447-
containerName: "containerName",
1448-
expected: []string{"--cancel-list-on-mount-seconds=10",
1449-
"--container-name=containerName",
1450-
"--disable-version-check=false",
1451-
"--pre-mount-validate=true",
1452-
"--empty-dir-check=false",
1453-
"--tmp-path=/var/log",
1454-
"--use-https=true",
1455-
"targetPath",
1456-
},
1457-
},
14581441
}
14591442

14601443
for _, test := range tests {

0 commit comments

Comments
 (0)