Skip to content

Commit fc0ecdd

Browse files
authored
Merge pull request #1998 from k8s-infra-cherrypick-robot/cherry-pick-1994-to-release-1.25
[release-1.25] cleanup: disable version check in blobfuse2 driver by default
2 parents f8c1c9b + 861a1c6 commit fc0ecdd

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

pkg/blob/blob.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,8 @@ 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",
1036+
"--empty-dir-check": "false",
1037+
"--disable-version-check": "true",
10371038
}
10381039

10391040
// stores the mount options already included in mountOptions

pkg/blob/blob_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,7 @@ 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",
14081409
"--pre-mount-validate=true",
14091410
"--empty-dir-check=false",
14101411
"--tmp-path=/tmp",
@@ -1418,6 +1419,7 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14181419
containerName: "containerName",
14191420
expected: []string{"--cancel-list-on-mount-seconds=0",
14201421
"--container-name=containerName",
1422+
"--disable-version-check=true",
14211423
"--pre-mount-validate=false",
14221424
"--empty-dir-check=false",
14231425
"--tmp-path=/tmp",
@@ -1431,13 +1433,28 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14311433
containerName: "containerName",
14321434
expected: []string{"--cancel-list-on-mount-seconds=10",
14331435
"--container-name=containerName",
1436+
"--disable-version-check=true",
14341437
"--pre-mount-validate=false",
14351438
"--empty-dir-check=false",
14361439
"--tmp-path=/var/log",
14371440
"--use-https=true",
14381441
"targetPath",
14391442
},
14401443
},
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+
},
14411458
}
14421459

14431460
for _, test := range tests {

0 commit comments

Comments
 (0)