Merge pull request #403 from andyzhangx/blobfuse-1.3.7

feat: support blobfuse v1.3.7

Author: andyzhangx

README.md

@@ -15,7 +15,7 @@ This driver allows Kubernetes to access Azure Storage through one of following m
 ### Container Images & Kubernetes Compatibility:
 |driver version  |Image                                      | supported k8s version | built-in blobfuse version |
 |----------------|-------------------------------------------|-----------------------|---------------------------|
-|master branch   |mcr.microsoft.com/k8s/csi/blob-csi:latest  | 1.16+                 | 1.3.6                     |
+|master branch   |mcr.microsoft.com/k8s/csi/blob-csi:latest  | 1.16+                 | 1.3.7                     |
 |v1.0.0          |mcr.microsoft.com/k8s/csi/blob-csi:v1.0.0  | 1.16+                 | 1.3.6                     |
 |v0.11.0         |mcr.microsoft.com/k8s/csi/blob-csi:v0.11.0 | 1.15+                 | 1.3.6                     |
 |v0.10.0         |mcr.microsoft.com/k8s/csi/blob-csi:v0.10.0 | 1.15+                 | 1.3.5                     |

deploy/blobfuse-proxy/blobfuse-proxy.yaml

@@ -37,12 +37,9 @@ spec:
           - '-c'
           - |
             set -xe
-            apt update
-            # update blobfuse version on the host to 1.3.6
             wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
             dpkg -i packages-microsoft-prod.deb
-            apt-get update
-            apt-get install -y blobfuse=1.3.6
+            apt-get update && apt-get install -y blobfuse
             # download blobfuse-proxy .deb package
             wget https://github.com/kubernetes-sigs/blob-csi-driver/raw/master/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb -O /tmp/blobfuse-proxy-v0.1.0.deb
             dpkg -i /tmp/blobfuse-proxy-v0.1.0.deb

deploy/example/storageclass-blobfuse-existing-container.yaml

@@ -15,6 +15,7 @@ mountOptions:
   - -o allow_other
   - --file-cache-timeout-in-seconds=120
   - --use-attr-cache=true
+  - --cancel-list-on-mount-seconds=60  # prevent billing charges on mounting
   - -o attr_timeout=120
   - -o entry_timeout=120
   - -o negative_timeout=120

deploy/example/storageclass-blobfuse-readonly.yaml

@@ -14,4 +14,5 @@ mountOptions:
   - -o ro
   - -o allow_other
   - --file-cache-timeout-in-seconds=0
+  - --cancel-list-on-mount-seconds=60  # prevent billing charges on mounting
   - --log-level=LOG_DEBUG  # only for debugging

deploy/example/storageclass-blobfuse.yaml

@@ -12,6 +12,7 @@ mountOptions:
   - -o allow_other
   - --file-cache-timeout-in-seconds=120
   - --use-attr-cache=true
+  - --cancel-list-on-mount-seconds=60  # prevent billing charges on mounting
   - -o attr_timeout=120
   - -o entry_timeout=120
   - -o negative_timeout=120

pkg/blobplugin/Dockerfile

@@ -17,7 +17,7 @@ ARG ARCH
 FROM k8s.gcr.io/build-image/debian-base-${ARCH}:v2.1.3
 COPY ./_output/blobplugin /blobplugin
 RUN apt-get update && clean-install ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev wget
-RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb && dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt install blobfuse fuse -y && rm -f /tmp/packages-microsoft-prod.deb
+RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt install blobfuse fuse -y && rm -f /tmp/packages-microsoft-prod.deb
 RUN apt remove wget -y
 # this is a workaround to install nfs-common & nfs-kernel-server and don't quit with error
 RUN apt-get update && apt install nfs-common nfs-kernel-server -y || true

pkg/blobplugin/dev.Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM mcr.microsoft.com/aks/fundamental/base-ubuntu:v0.0.5
-RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
 RUN dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt-get install -y ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev blobfuse nfs-common
 LABEL maintainers="andyzhangx"
 LABEL description="Azure Blob Storage CSI driver"

test/e2e/dynamic_provisioning_test.go

@@ -66,6 +66,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
 						MountOptions: []string{
 							"-o allow_other",
 							"--file-cache-timeout-in-seconds=120",
+							"--cancel-list-on-mount-seconds=0",
 						},
 						VolumeMount: testsuites.VolumeMountDetails{
 							NameGenerate:      "test-volume-",
@@ -93,6 +94,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
 					MountOptions: []string{
 						"-o allow_other",
 						"--file-cache-timeout-in-seconds=120",
+						"--cancel-list-on-mount-seconds=60",
 					},
 					VolumeMount: testsuites.VolumeMountDetails{
 						NameGenerate:      "test-volume-",