Merge pull request #691 from cvvz/prune-blobfuse-proxy

feat: combine blobfuse-proxy daemonset with driver node daemonset

Author: k8s-ci-robot

.github/workflows/linux.yaml

@@ -41,7 +41,6 @@ jobs:
       run: |
         export PATH=$PATH:$HOME/.local/bin
         make blobfuse-proxy
-        sudo dpkg -i _output/blobfuse-proxy.deb
 
     - name: Get code coverage
       env:

.gitignore

@@ -69,5 +69,3 @@ cscope.*
 /bazel-*
 *.pyc
 profile.cov
-
-pkg/blobfuse-proxy/debpackage/usr/

Makefile

@@ -178,6 +178,4 @@ delete-metrics-svc:
 
 .PHONY: blobfuse-proxy
 blobfuse-proxy:
-	mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/ ./_output
-	CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy ./pkg/blobfuse-proxy
-	$(DPKG_DEB) --build pkg/blobfuse-proxy/debpackage ./_output/blobfuse-proxy.deb
+	CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy

charts/latest/blob-csi-driver-v1.14.0.tgz

@@ -32,6 +32,9 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
+{{- if .Values.node.enableBlobfuseProxy }}
+      hostPID: true
+{{- end }}
       hostNetwork: true
       dnsPolicy: Default
       serviceAccountName: {{ .Values.serviceAccount.node }}
@@ -56,6 +59,38 @@ spec:
 {{- with .Values.node.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
+{{- end }}
+{{- if .Values.node.enableBlobfuseProxy }}
+      initContainers:
+        - name: install-blobfuse-proxy
+{{- if hasPrefix "/" .Values.image.blob.repository }}
+          image: "{{ .Values.image.baseRepo }}{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
+{{- else }}
+          image: "{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
+{{- end }}
+          imagePullPolicy: IfNotPresent
+          command:
+            - "/blobfuse-proxy/init.sh"
+          securityContext:
+            privileged: true
+          env:
+            - name: DEBIAN_FRONTEND
+              value: "noninteractive"
+            - 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: "{{ .Values.node.blobfuseProxy.maxOpenFileNum }}"
+            - name: DISABLE_UPDATEDB
+              value: "{{ .Values.node.blobfuseProxy.disableUpdateDB }}"
+          volumeMounts:
+            - name: host-usr
+              mountPath: /host/usr
+            - name: host-etc
+              mountPath: /host/etc
 {{- end }}
       containers:
         - name: liveness-probe
@@ -188,6 +223,14 @@ spec:
             {{- end }}
           resources: {{- toYaml .Values.node.resources.blob | nindent 12 }}
       volumes:
+{{- if .Values.node.enableBlobfuseProxy }}
+        - name: host-usr
+          hostPath:
+            path: /usr
+        - name: host-etc
+          hostPath:
+            path: /etc
+{{- end }}
         - hostPath:
             path: {{ .Values.linux.kubelet }}/plugins/{{ .Values.driver.name }}
             type: DirectoryOrCreate

charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml

@@ -148,8 +148,6 @@ node:
   nodeSelector: {}
   tolerations:
     - operator: "Exists"
-  livenessProbe:
-    healthPort: 29633
 
 feature:
   enableFSGroupPolicy: false

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

@@ -18,6 +18,7 @@ spec:
         app: csi-blob-node
     spec:
       hostNetwork: true
+      hostPID: true
       dnsPolicy: Default
       serviceAccountName: csi-blob-node-sa
       nodeSelector:
@@ -34,6 +35,32 @@ spec:
       priorityClassName: system-node-critical
       tolerations:
         - operator: "Exists"
+      initContainers:
+        - name: install-blobfuse-proxy
+          image: mcr.microsoft.com/k8s/csi/blob-csi:latest
+          imagePullPolicy: IfNotPresent
+          command:
+            - "/blobfuse-proxy/init.sh"
+          securityContext:
+            privileged: true
+          env:
+            - name: DEBIAN_FRONTEND
+              value: "noninteractive"
+            - name: INSTALL_BLOBFUSE
+              value: "true"
+            - name: BLOBFUSE_VERSION
+              value: 1.4.4
+            - name: SET_MAX_OPEN_FILE_NUM
+              value: "true"
+            - name: MAX_FILE_NUM
+              value: "9000000"
+            - name: DISABLE_UPDATEDB
+              value: "true"
+          volumeMounts:
+            - name: host-usr
+              mountPath: /host/usr
+            - name: host-etc
+              mountPath: /host/etc
       containers:
         - name: liveness-probe
           volumeMounts:
@@ -139,6 +166,12 @@ spec:
               cpu: 10m
               memory: 20Mi
       volumes:
+        - name: host-usr
+          hostPath:
+            path: /usr
+        - name: host-etc
+          hostPath:
+            path: /etc
         - hostPath:
             path: /var/lib/kubelet/plugins/blob.csi.azure.com
             type: DirectoryOrCreate

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

@@ -42,7 +42,6 @@ kubectl apply -f $repo/csi-blob-controller.yaml
 if [[ "$#" -gt 1 ]]; then
   if [[ "$2" == *"blobfuse-proxy"* ]]; then
     echo "set enable-blobfuse-proxy as true ..."
-    kubectl apply -f $repo/blobfuse-proxy.yaml
     if [[ "$2" == *"local"* ]]; then
       cat $repo/csi-blob-node.yaml | sed 's/enable-blobfuse-proxy=false/enable-blobfuse-proxy=true/g' | kubectl apply -f -
     else