Skip to content

Commit d1b9f49

Browse files
committed
chore: install fuse on Ubuntu 18.04
fix shell fix typo chore: install blobfuse package by default
1 parent 0211b25 commit d1b9f49

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

charts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
124124
| `node.logLevel` | node driver log level | `5` |
125125
| `node.mountPermissions` | mounted folder permissions (only applies for NFS) | `0777`
126126
| `node.enableBlobfuseProxy` | enable blobfuse-proxy on agent node | `false` |
127-
| `node.blobfuseProxy.installBlobfuse` | whether blobfuse should be installed on agent node| `false` |
127+
| `node.blobfuseProxy.installBlobfuse` | whether blobfuse should be installed on agent node| `true` |
128128
| `node.blobfuseProxy.blobfuseVersion` | installed blobfuse version on agent node (if the value is empty, it means that the latest version should be installed.) | `` |
129129
| `node.blobfuseProxy.installBlobfuse2` | whether blobfuse2 should be installed on agent node| `true` |
130130
| `node.blobfuseProxy.blobfuse2Version` | installed blobfuse2 version on agent node (if the value is empty, it means that the latest version should be installed.) | ``
-2 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ node:
116116
logLevel: 5
117117
enableBlobfuseProxy: false
118118
blobfuseProxy:
119-
installBlobfuse: false
119+
installBlobfuse: true
120120
blobfuseVersion: ""
121121
installBlobfuse2: true
122122
blobfuse2Version: ""

deploy/csi-blob-node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
- name: INSTALL_BLOBFUSE_PROXY
5050
value: "true"
5151
- name: INSTALL_BLOBFUSE
52-
value: "false"
52+
value: "true"
5353
- name: BLOBFUSE_VERSION
5454
value: ""
5555
- name: INSTALL_BLOBFUSE2

pkg/blobfuse-proxy/init.sh

100644100755
Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
set -xe
1818

1919
INSTALL_BLOBFUSE_PROXY=${INSTALL_BLOBFUSE_PROXY:-true}
20-
INSTALL_BLOBFUSE=${INSTALL_BLOBFUSE:-true}
2120
DISABLE_UPDATEDB=${DISABLE_UPDATEDB:-true}
2221
SET_MAX_OPEN_FILE_NUM=${SET_MAX_OPEN_FILE_NUM:-true}
2322
SET_READ_AHEAD_SIZE=${SET_READ_AHEAD_SIZE:-true}
@@ -32,30 +31,40 @@ then
3231
# refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
3332
yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
3433

35-
# install/update blobfuse
34+
pkg_list=""
3635
if [ "${INSTALL_BLOBFUSE}" = "true" ]
3736
then
37+
pkg_list="${pkg_list} fuse"
3838
# install blobfuse with latest version or specific version
3939
if [ -z "${BLOBFUSE_VERSION}" ]; then
4040
echo "install blobfuse with latest version"
41-
$HOST_CMD apt-get install -y fuse blobfuse
41+
pkg_list="${pkg_list} blobfuse"
4242
else
43-
$HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}"
43+
pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
4444
fi
4545
fi
4646

47-
# install/update blobfuse2
4847
if [ "${INSTALL_BLOBFUSE2}" = "true" ]
4948
then
49+
release=$($HOST_CMD lsb_release -rs)
50+
if [ "$release" = "18.04" ]; then
51+
echo "install fuse for blobfuse2"
52+
pkg_list="${pkg_list} fuse"
53+
else
54+
echo "install fuse3 for blobfuse2, current release is $release"
55+
pkg_list="${pkg_list} fuse3"
56+
fi
57+
5058
# install blobfuse2 with latest version or specific version
5159
if [ -z "${BLOBFUSE2_VERSION}" ]; then
5260
echo "install blobfuse2 with latest version"
53-
$HOST_CMD apt-get install -y blobfuse2
61+
pkg_list="${pkg_list} blobfuse2"
5462
else
55-
$HOST_CMD apt-get install -y blobfuse2="${BLOBFUSE2_VERSION}"
63+
pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
5664
fi
5765
fi
58-
66+
echo "begin to install ${pkg_list}"
67+
$HOST_CMD apt-get install -y $pkg_list
5968
$HOST_CMD rm -f /etc/packages-microsoft-prod.deb
6069
fi
6170

0 commit comments

Comments
 (0)