chore: install fuse on Ubuntu 18.04

fix shell fix typo chore: install blobfuse package by default
kubernetes-sigs · Apr 2, 2023 · d1b9f49 · d1b9f49
1 parent 0211b25
commit d1b9f49
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -124,7 +124,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `node.logLevel`                                       | node driver log level                                 | `5`                                                            |
 | `node.mountPermissions`                               | mounted folder permissions (only applies for NFS)                 | `0777`
 | `node.enableBlobfuseProxy`                            | enable blobfuse-proxy on agent node                           | `false`                                                          |
-| `node.blobfuseProxy.installBlobfuse`                  | whether blobfuse should be installed on agent node| `false`                                                          |
+| `node.blobfuseProxy.installBlobfuse`                  | whether blobfuse should be installed on agent node| `true`                                                          |
 | `node.blobfuseProxy.blobfuseVersion`                  | installed blobfuse version on agent node (if the value is empty, it means that the latest version should be installed.) | ``                                                          |
 | `node.blobfuseProxy.installBlobfuse2`                 | whether blobfuse2 should be installed on agent node| `true`                                                          |
 | `node.blobfuseProxy.blobfuse2Version`                 | installed blobfuse2 version on agent node (if the value is empty, it means that the latest version should be installed.) | ``

diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml
@@ -116,7 +116,7 @@ node:
   logLevel: 5
   enableBlobfuseProxy: false
   blobfuseProxy:
-    installBlobfuse: false
+    installBlobfuse: true
     blobfuseVersion: ""
     installBlobfuse2: true
     blobfuse2Version: ""

diff --git a/deploy/csi-blob-node.yaml b/deploy/csi-blob-node.yaml
@@ -49,7 +49,7 @@ spec:
             - name: INSTALL_BLOBFUSE_PROXY
               value: "true"
             - name: INSTALL_BLOBFUSE
-              value: "false"
+              value: "true"
             - name: BLOBFUSE_VERSION
               value: ""
             - name: INSTALL_BLOBFUSE2

diff --git a/pkg/blobfuse-proxy/init.sh b/pkg/blobfuse-proxy/init.sh
@@ -17,7 +17,6 @@
 set -xe
 
 INSTALL_BLOBFUSE_PROXY=${INSTALL_BLOBFUSE_PROXY:-true}
-INSTALL_BLOBFUSE=${INSTALL_BLOBFUSE:-true}
 DISABLE_UPDATEDB=${DISABLE_UPDATEDB:-true}
 SET_MAX_OPEN_FILE_NUM=${SET_MAX_OPEN_FILE_NUM:-true}
 SET_READ_AHEAD_SIZE=${SET_READ_AHEAD_SIZE:-true}
@@ -32,30 +31,40 @@ then
   # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
   yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
 
-  # install/update blobfuse
+  pkg_list=""
   if [ "${INSTALL_BLOBFUSE}" = "true" ]
   then
+    pkg_list="${pkg_list} fuse"
     # install blobfuse with latest version or specific version
     if [ -z "${BLOBFUSE_VERSION}" ]; then
       echo "install blobfuse with latest version"
-      $HOST_CMD apt-get install -y fuse blobfuse
+      pkg_list="${pkg_list} blobfuse"
     else
-      $HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}"
+      pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
     fi
   fi
 
-  # install/update blobfuse2
   if [ "${INSTALL_BLOBFUSE2}" = "true" ]
   then
+    release=$($HOST_CMD lsb_release -rs)
+    if [ "$release" = "18.04" ]; then
+      echo "install fuse for blobfuse2"
+      pkg_list="${pkg_list} fuse"
+    else
+      echo "install fuse3 for blobfuse2, current release is $release"
+      pkg_list="${pkg_list} fuse3"
+    fi
+
     # install blobfuse2 with latest version or specific version
     if [ -z "${BLOBFUSE2_VERSION}" ]; then
       echo "install blobfuse2 with latest version"
-      $HOST_CMD apt-get install -y blobfuse2
+      pkg_list="${pkg_list} blobfuse2"
     else
-      $HOST_CMD apt-get install -y blobfuse2="${BLOBFUSE2_VERSION}"
+      pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
     fi
   fi
-
+  echo "begin to install ${pkg_list}"
+  $HOST_CMD apt-get install -y $pkg_list
   $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
 fi