Merge pull request #2174 from andyzhangx/bin-path-mount

[release-1.26] fix(proxy_installer): add necessary mounts for cos, gardenlinux bin paths

Author: andyzhangx

charts/latest/blob-csi-driver-1.26.7.tgz

@@ -109,12 +109,23 @@ spec:
             - name: ALLOW_PACKAGE_INSTALL_DOWNGRADE
               value: "{{ .Values.node.blobfuseProxy.allowPackageInstallDowngrade }}"
           volumeMounts:
+{{- if eq .Values.linux.distro "cos" }}
+            - name: host-home-kubernetes-bin
+              mountPath: /host/home/kubernetes/bin
+{{- end }}
+{{- if eq .Values.linux.distro "gardenlinux" }}
+            - name: host-var-bin
+              mountPath: /host/var/bin
+{{- end }}
             - name: host-usr
               mountPath: /host/usr
             - name: host-usr-local
               mountPath: /host/usr/local
             - name: host-etc
               mountPath: /host/etc
+{{- if .Values.node.additionalVolumeMounts }}
+{{- toYaml .Values.node.additionalVolumeMounts | nindent 12 }}
+{{- end }}
       containers:
         - name: liveness-probe
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
@@ -286,6 +297,16 @@ spec:
               name: mountpoint-dir
 {{- end }}
       volumes:
+{{- if eq .Values.linux.distro "cos" }}
+        - name: host-home-kubernetes-bin
+          hostPath:
+            path: /home/kubernetes/bin
+{{- end }}
+{{- if eq .Values.linux.distro "gardenlinux" }}
+        - name: host-var-bin
+          hostPath:
+            path: /var/bin
+{{- end }}
         - name: host-usr
           hostPath:
             path: /usr
@@ -334,6 +355,9 @@ spec:
             path: /lib/modules
             type: DirectoryOrCreate
         {{- end }}
+{{- if .Values.node.additionalVolumes }}
+{{- toYaml .Values.node.additionalVolumes | nindent 8 }}
+{{- end }}
       {{- if .Values.securityContext }}
       securityContext: {{- toYaml .Values.securityContext | nindent 8 }}
       {{- end }}

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

@@ -163,6 +163,21 @@ node:
   tolerations:
     - operator: "Exists"
   enableAznfsMount: true
+  # Additional volumes to be added to the DaemonSet
+  additionalVolumes: []
+  # - name: custom-config
+  #   configMap:
+  #     name: my-config
+  # - name: custom-secret
+  #   secret:
+  #     secretName: my-secret
+  # Additional volume mounts to be added to the init container
+  additionalVolumeMounts: []
+  # - name: custom-config
+  #   mountPath: /etc/custom-config
+  # - name: custom-secret
+  #   mountPath: /etc/custom-secret
+  #   readOnly: true
 
 feature:
   fsGroupPolicy: ReadWriteOnceWithFSType

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

@@ -34,8 +34,8 @@ fi
 updateBlobfuse2="true"
 if [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]
 then
-  if [ -f "/host/${BIN_PATH}/blobfuse2" ];then
-    old=$(sha256sum /host/${BIN_PATH}/blobfuse2 | awk '{print $1}')
+  if [ -f "/host${BIN_PATH}/blobfuse2" ];then
+    old=$(sha256sum /host${BIN_PATH}/blobfuse2 | awk '{print $1}')
     new=$(sha256sum /usr/bin/blobfuse2 | awk '{print $1}')
     if [ "$old" = "$new" ];then
       updateBlobfuse2="false"
@@ -48,15 +48,15 @@ else
 fi
 if [ "$updateBlobfuse2" = "true" ];then
   echo "copy blobfuse2...."
-  cp /usr/bin/blobfuse2 /host/${BIN_PATH}/blobfuse2 --force
-  chmod 755 /host/${BIN_PATH}/blobfuse2
+  cp /usr/bin/blobfuse2 /host${BIN_PATH}/blobfuse2 --force
+  chmod 755 /host${BIN_PATH}/blobfuse2
 fi
 
 if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
   # install blobfuse-proxy
   updateBlobfuseProxy="true"
-  if [ -f "/host/${BIN_PATH}/blobfuse-proxy" ];then
-    old=$(sha256sum /host/${BIN_PATH}/blobfuse-proxy | awk '{print $1}')
+  if [ -f "/host${BIN_PATH}/blobfuse-proxy" ];then
+    old=$(sha256sum /host${BIN_PATH}/blobfuse-proxy | awk '{print $1}')
     new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
     if [ "$old" = "$new" ];then
       updateBlobfuseProxy="false"
@@ -66,8 +66,8 @@ if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
   if [ "$updateBlobfuseProxy" = "true" ];then
     echo "copy blobfuse-proxy...."
     rm -rf /host/${KUBELET_PATH}/plugins/blob.csi.azure.com/blobfuse-proxy.sock
-    cp /blobfuse-proxy/blobfuse-proxy /host/${BIN_PATH}/blobfuse-proxy --force
-    chmod 755 /host/${BIN_PATH}/blobfuse-proxy
+    cp /blobfuse-proxy/blobfuse-proxy /host${BIN_PATH}/blobfuse-proxy --force
+    chmod 755 /host${BIN_PATH}/blobfuse-proxy
   fi
 
   updateService="true"