Skip to content

Commit b4a39cf

Browse files
authored
Revert "[release-1.26] cleanup: disable version check in blobfuse2 driver by default"
1 parent 5ab823a commit b4a39cf

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
@@ -1056,8 +1056,7 @@ func appendDefaultMountOptions(mountOptions []string, tmpPath, containerName str
10561056
// prevent billing charges on mounting
10571057
"--cancel-list-on-mount-seconds": "10",
10581058
// allow remounting using a non-empty tmp-path
1059-
"--empty-dir-check": "false",
1060-
"--disable-version-check": "true",
1059+
"--empty-dir-check": "false",
10611060
}
10621061

10631062
// 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
@@ -1414,7 +1414,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14141414
containerName: "containerName",
14151415
expected: []string{"--cancel-list-on-mount-seconds=10",
14161416
"--container-name=containerName",
1417-
"--disable-version-check=true",
14181417
"--pre-mount-validate=true",
14191418
"--empty-dir-check=false",
14201419
"--tmp-path=/tmp",
@@ -1428,7 +1427,6 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14281427
containerName: "containerName",
14291428
expected: []string{"--cancel-list-on-mount-seconds=0",
14301429
"--container-name=containerName",
1431-
"--disable-version-check=true",
14321430
"--pre-mount-validate=false",
14331431
"--empty-dir-check=false",
14341432
"--tmp-path=/tmp",
@@ -1442,28 +1440,13 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14421440
containerName: "containerName",
14431441
expected: []string{"--cancel-list-on-mount-seconds=10",
14441442
"--container-name=containerName",
1445-
"--disable-version-check=true",
14461443
"--pre-mount-validate=false",
14471444
"--empty-dir-check=false",
14481445
"--tmp-path=/var/log",
14491446
"--use-https=true",
14501447
"targetPath",
14511448
},
14521449
},
1453-
{
1454-
options: []string{"targetPath", "--tmp-path=/var/log", "--disable-version-check=false"},
1455-
tmpPath: "/tmp",
1456-
containerName: "containerName",
1457-
expected: []string{"--cancel-list-on-mount-seconds=10",
1458-
"--container-name=containerName",
1459-
"--disable-version-check=false",
1460-
"--pre-mount-validate=true",
1461-
"--empty-dir-check=false",
1462-
"--tmp-path=/var/log",
1463-
"--use-https=true",
1464-
"targetPath",
1465-
},
1466-
},
14671450
}
14681451

14691452
for _, test := range tests {

0 commit comments

Comments
 (0)