Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/blob/blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,8 @@ 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",
"--empty-dir-check": "false",
"--disable-version-check": "true",
}

// stores the mount options already included in mountOptions
Expand Down
17 changes: 17 additions & 0 deletions pkg/blob/blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,7 @@ 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",
Expand All @@ -1427,6 +1428,7 @@ 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",
Expand All @@ -1440,13 +1442,28 @@ 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 {
Expand Down
Loading