Merge pull request #542 from andyzhangx/refine-blobfuse-proxy-install2

chore: refine blobfuse-proxy install script

Author: andyzhangx

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

@@ -44,17 +44,15 @@ spec:
             - '-c'
             - |
               set -xe
-              dpkg -i /tmp/packages-microsoft-prod.deb
-              apt-get install -y blobfuse
+              dpkg -i /tmp/packages-microsoft-prod.deb && apt-get install -y blobfuse
               dpkg -i /tmp/blobfuse-proxy.deb
               rm -f /tmp/packages-microsoft-prod.deb /tmp/blobfuse-proxy.deb
               mkdir -p /var/lib/kubelet/plugins/blob.csi.azure.com
-              echo "set max open file num"
-              sysctl -w fs.file-max=9000000
               echo "Enabling blobfuse proxy systemctl service"
-              systemctl daemon-reload
               systemctl enable blobfuse-proxy
               systemctl start blobfuse-proxy
+              echo "set max open file num"
+              sysctl -w fs.file-max=9000000
               echo "waiting for blobfuse-proxy service to start"
               sleep 3s
               # tail blobfuse proxy logs

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

@@ -44,17 +44,15 @@ spec:
             - '-c'
             - |
               set -xe
-              dpkg -i /tmp/packages-microsoft-prod.deb
-              apt-get install -y blobfuse
+              dpkg -i /tmp/packages-microsoft-prod.deb && apt-get install -y blobfuse
               dpkg -i /tmp/blobfuse-proxy.deb
               rm -f /tmp/packages-microsoft-prod.deb /tmp/blobfuse-proxy.deb
               mkdir -p /var/lib/kubelet/plugins/blob.csi.azure.com
-              echo "set max open file num"
-              sysctl -w fs.file-max=9000000
               echo "Enabling blobfuse proxy systemctl service"
-              systemctl daemon-reload
               systemctl enable blobfuse-proxy
               systemctl start blobfuse-proxy
+              echo "set max open file num"
+              sysctl -w fs.file-max=9000000
               echo "waiting for blobfuse-proxy service to start"
               sleep 3s
               # tail blobfuse proxy logs

deploy/blobfuse-proxy.yaml

@@ -42,7 +42,7 @@ 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 ./deploy/blobfuse-proxy.yaml
+    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

deploy/install-driver.sh

@@ -36,7 +36,7 @@ fi
 if [[ "$#" -gt 1 ]]; then
   if [[ "$2" == *"blobfuse-proxy"* ]]; then
     echo "remove blobfuse-proxy deployment ..."
-    kubectl delete -f ./deploy/blobfuse-proxy.yaml
+    kubectl delete -f $repo/blobfuse-proxy.yaml
   fi
 fi