feat: add chart parameter for blobfuse-proxy env setting

fix chart format fix file num
kubernetes-sigs · Oct 16, 2021 · bd524eb · bd524eb
1 parent f5f4d59
commit bd524eb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -121,7 +121,11 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `node.metricsPort`                                    | metrics port of csi-blob-node                         | `29635`                                                          |
 | `node.livenessProbe.healthPort `                      | health check port for liveness probe                  | `29633` |
 | `node.logLevel`                                       | node driver log level                                 | `5`                                                            |
-| `node.enableBlobfuseProxy`                            | node enable blobfuse-proxy                            | `false`                                                          |
+| `node.enableBlobfuseProxy`                            | enable blobfuse-proxy on agent node                           | `false`                                                          |
+| `node.blobfuseProxy.installBlobfuse`                  | whether install blobfuse on agent node| `true`                                                          |
+| `node.blobfuseProxy.blobfuseVersion`                  | installed blobfuse version on agent node| `1.4.1`                                                          |
+| `node.blobfuseProxy.setMaxOpenFileNum`                | whether set max open file num on agent node| `true`                                                          |
+| `node.blobfuseProxy.maxOpenFileNum`                   | max open file num on agent node| `9000000`                                                          |
 | `node.blobfuseCachePath`                              | blobfuse cache path(`tmp-path`)                       | `/mnt`                                                          |
 | `node.resources.livenessProbe.limits.cpu`             | liveness-probe cpu limits                             | 100m                                                           |
 | `node.resources.livenessProbe.limits.memory`          | liveness-probe memory limits                          | 100Mi                                                          |

diff --git a/charts/latest/blob-csi-driver-v1.6.0.tgz b/charts/latest/blob-csi-driver-v1.6.0.tgz
diff --git a/charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml b/charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml
@@ -77,16 +77,16 @@ spec:
           imagePullPolicy: IfNotPresent
           name: sysctl-install-blobfuse-proxy
           env:
-            - name: "DEBIAN_FRONTEND"
+            - name: DEBIAN_FRONTEND
               value: "noninteractive"
-            - name: "INSTALL_BLOBFUSE"
-              value: "true"
-            - name: "BLOBFUSE_VERSION"
-              value: "1.4.1"
-            - name: "SET_MAX_OPEN_FILE_NUM"
-              value: "true"
+            - name: INSTALL_BLOBFUSE
+              value: "{{ .Values.node.blobfuseProxy.installBlobfuse }}"
+            - name: BLOBFUSE_VERSION
+              value: "{{ .Values.node.blobfuseProxy.blobfuseVersion }}"
+            - name: SET_MAX_OPEN_FILE_NUM
+              value: "{{ .Values.node.blobfuseProxy.setMaxOpenFileNum }}"
             - name: "MAX_FILE_NUM"
-              value: "9000000"
+              value: "{{ .Values.node.blobfuseProxy.maxOpenFileNum }}"
           resources:
             limits:
               cpu: 200m

diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml
@@ -95,6 +95,11 @@ node:
     healthPort: 29633
   logLevel: 5
   enableBlobfuseProxy: false
+  blobfuseProxy:
+    installBlobfuse: true
+    blobfuseVersion: 1.4.1
+    setMaxOpenFileNum: true
+    maxOpenFileNum: 9000000
   blobfuseCachePath: /mnt
   resources:
     livenessProbe:

diff --git a/deploy/blobfuse-proxy.yaml b/deploy/blobfuse-proxy.yaml
@@ -69,13 +69,13 @@ spec:
           imagePullPolicy: IfNotPresent
           name: sysctl-install-blobfuse-proxy
           env:
-            - name: "DEBIAN_FRONTEND"
+            - name: DEBIAN_FRONTEND
               value: "noninteractive"
-            - name: "INSTALL_BLOBFUSE"
+            - name: INSTALL_BLOBFUSE
               value: "true"
-            - name: "BLOBFUSE_VERSION"
-              value: "1.4.1"
-            - name: "SET_MAX_OPEN_FILE_NUM"
+            - name: BLOBFUSE_VERSION
+              value: 1.4.1
+            - name: SET_MAX_OPEN_FILE_NUM
               value: "true"
             - name: "MAX_FILE_NUM"
               value: "9000000"