Skip to content

Commit e5f514c

Browse files
authored
Merge pull request #1997 from k8s-infra-cherrypick-robot/cherry-pick-1994-to-release-1.26
[release-1.26] cleanup: disable version check in blobfuse2 driver by default
2 parents 9c6e91c + 105acef commit e5f514c

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
@@ -1056,7 +1056,8 @@ 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",
1059+
"--empty-dir-check": "false",
1060+
"--disable-version-check": "true",
10601061
}
10611062

10621063
// 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
@@ -1414,6 +1414,7 @@ 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",
14171418
"--pre-mount-validate=true",
14181419
"--empty-dir-check=false",
14191420
"--tmp-path=/tmp",
@@ -1427,6 +1428,7 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14271428
containerName: "containerName",
14281429
expected: []string{"--cancel-list-on-mount-seconds=0",
14291430
"--container-name=containerName",
1431+
"--disable-version-check=true",
14301432
"--pre-mount-validate=false",
14311433
"--empty-dir-check=false",
14321434
"--tmp-path=/tmp",
@@ -1440,13 +1442,28 @@ func TestAppendDefaultMountOptions(t *testing.T) {
14401442
containerName: "containerName",
14411443
expected: []string{"--cancel-list-on-mount-seconds=10",
14421444
"--container-name=containerName",
1445+
"--disable-version-check=true",
14431446
"--pre-mount-validate=false",
14441447
"--empty-dir-check=false",
14451448
"--tmp-path=/var/log",
14461449
"--use-https=true",
14471450
"targetPath",
14481451
},
14491452
},
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+
},
14501467
}
14511468

14521469
for _, test := range tests {

0 commit comments

Comments
 (0)