Skip to content

Commit 0211b25

Browse files
committed
chore: add chart file change for blobfuse2 install
fix comments remove fuse3 install
1 parent 7745036 commit 0211b25

File tree

6 files changed

+26
-12
lines changed

6 files changed

+26
-12
lines changed

charts/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ 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 install blobfuse on agent node| `true` |
128-
| `node.blobfuseProxy.blobfuseVersion` | installed blobfuse version on agent node| `1.4.2` |
127+
| `node.blobfuseProxy.installBlobfuse` | whether blobfuse should be installed on agent node| `false` |
128+
| `node.blobfuseProxy.blobfuseVersion` | installed blobfuse version on agent node (if the value is empty, it means that the latest version should be installed.) | `` |
129+
| `node.blobfuseProxy.installBlobfuse2` | whether blobfuse2 should be installed on agent node| `true` |
130+
| `node.blobfuseProxy.blobfuse2Version` | installed blobfuse2 version on agent node (if the value is empty, it means that the latest version should be installed.) | ``
129131
| `node.blobfuseProxy.setMaxOpenFileNum` | whether set max open file num on agent node| `true` |
130132
| `node.blobfuseProxy.maxOpenFileNum` | max open file num on agent node| `9000000` |
131133
| `node.blobfuseProxy.disableUpdateDB` | whether disable updateDB on blobfuse (saving storage account list usage) | `true` |
23 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ spec:
8080
value: "{{ .Values.node.blobfuseProxy.installBlobfuse }}"
8181
- name: BLOBFUSE_VERSION
8282
value: "{{ .Values.node.blobfuseProxy.blobfuseVersion }}"
83+
- name: INSTALL_BLOBFUSE2
84+
value: "{{ .Values.node.blobfuseProxy.installBlobfuse2 }}"
85+
- name: BLOBFUSE2_VERSION
86+
value: "{{ .Values.node.blobfuseProxy.blobfuse2Version }}"
8387
- name: SET_MAX_OPEN_FILE_NUM
8488
value: "{{ .Values.node.blobfuseProxy.setMaxOpenFileNum }}"
8589
- name: MAX_FILE_NUM

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ node:
116116
logLevel: 5
117117
enableBlobfuseProxy: false
118118
blobfuseProxy:
119-
installBlobfuse: true
120-
blobfuseVersion: 1.4.5
119+
installBlobfuse: false
120+
blobfuseVersion: ""
121+
installBlobfuse2: true
122+
blobfuse2Version: ""
121123
setMaxOpenFileNum: true
122124
maxOpenFileNum: "9000000"
123125
disableUpdateDB: true

deploy/csi-blob-node.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,16 @@ spec:
4646
env:
4747
- name: DEBIAN_FRONTEND
4848
value: "noninteractive"
49-
- name: INSTALL_BLOBFUSE
50-
value: "true"
5149
- name: INSTALL_BLOBFUSE_PROXY
5250
value: "true"
51+
- name: INSTALL_BLOBFUSE
52+
value: "false"
5353
- name: BLOBFUSE_VERSION
54-
value: 1.4.5
54+
value: ""
55+
- name: INSTALL_BLOBFUSE2
56+
value: "true"
57+
- name: BLOBFUSE2_VERSION
58+
value: ""
5559
- name: SET_MAX_OPEN_FILE_NUM
5660
value: "true"
5761
- name: MAX_FILE_NUM

pkg/blobfuse-proxy/init.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ HOST_CMD="nsenter --mount=/proc/1/ns/mnt"
2828
if [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]
2929
then
3030
cp /blobfuse-proxy/packages-microsoft-prod.deb /host/etc/
31+
# when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue.
32+
# refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
3133
yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
3234

3335
# install/update blobfuse
@@ -36,9 +38,9 @@ then
3638
# install blobfuse with latest version or specific version
3739
if [ -z "${BLOBFUSE_VERSION}" ]; then
3840
echo "install blobfuse with latest version"
39-
yes | $HOST_CMD apt-get install -y fuse blobfuse
41+
$HOST_CMD apt-get install -y fuse blobfuse
4042
else
41-
yes | $HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}"
43+
$HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}"
4244
fi
4345
fi
4446

@@ -48,9 +50,9 @@ then
4850
# install blobfuse2 with latest version or specific version
4951
if [ -z "${BLOBFUSE2_VERSION}" ]; then
5052
echo "install blobfuse2 with latest version"
51-
yes | $HOST_CMD apt-get install -y fuse3 blobfuse2
53+
$HOST_CMD apt-get install -y blobfuse2
5254
else
53-
yes | $HOST_CMD apt-get install -y fuse3 blobfuse2="${BLOBFUSE2_VERSION}"
55+
$HOST_CMD apt-get install -y blobfuse2="${BLOBFUSE2_VERSION}"
5456
fi
5557
fi
5658

@@ -124,4 +126,4 @@ then
124126
SUBSYSTEM=="bdi", ACTION=="add", PROGRAM="$AWK_PATH -v bdi=\$kernel 'BEGIN{ret=1} {if (\$4 == bdi){ret=0}} END{exit ret}' /proc/fs/nfsfs/volumes", ATTR{read_ahead_kb}="$READ_AHEAD_KB"
125127
EOF
126128
$HOST_CMD udevadm control --reload
127-
fi
129+
fi

0 commit comments

Comments
 (0)