fix: skip blobfuse-proxy copy if it's not enabled in driver init

kubernetes-sigs · Oct 21, 2024 · 7ca4ebd · 7ca4ebd
1 parent 2804061
commit 7ca4ebd
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 60 deletions.
diff --git a/pkg/blobfuse-proxy/install-proxy-rhcos.sh b/pkg/blobfuse-proxy/install-proxy-rhcos.sh
@@ -38,41 +38,41 @@ if [ "$updateBlobfuse2" = "true" ];then
   chmod 755 /host/usr/local/bin/blobfuse2
 fi
 
-# install blobfuse-proxy
-updateBlobfuseProxy="true"
-if [ -f "/host/usr/local/bin/blobfuse-proxy" ];then
-  old=$(sha256sum /host/usr/local/bin/blobfuse-proxy | awk '{print $1}')
-  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
-  if [ "$old" = "$new" ];then
-    updateBlobfuseProxy="false"
-    echo "no need to update blobfuse-proxy"
+if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
+  # install blobfuse-proxy
+  updateBlobfuseProxy="true"
+  if [ -f "/host/usr/local/bin/blobfuse-proxy" ];then
+    old=$(sha256sum /host/usr/local/bin/blobfuse-proxy | awk '{print $1}')
+    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
+    if [ "$old" = "$new" ];then
+      updateBlobfuseProxy="false"
+      echo "no need to update blobfuse-proxy"
+    fi
+  fi
+  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/usr/local/bin/blobfuse-proxy --force
+    chmod 755 /host/usr/local/bin/blobfuse-proxy
   fi
-fi
-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/usr/local/bin/blobfuse-proxy --force
-  chmod 755 /host/usr/local/bin/blobfuse-proxy
-fi
 
-updateService="true"
-echo "change from /usr/bin/blobfuse-proxy to /usr/local/bin/blobfuse-proxy in blobfuse-proxy.service"
-sed -i 's/\/usr\/bin\/blobfuse-proxy/\/usr\/local\/bin\/blobfuse-proxy/g' /blobfuse-proxy/blobfuse-proxy.service
-if [ -f "/host/etc/systemd/system/blobfuse-proxy.service" ];then
-  old=$(sha256sum /host/etc/systemd/system/blobfuse-proxy.service | awk '{print $1}')
-  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
-  if [ "$old" = "$new" ];then
-      updateService="false"
-      echo "no need to update blobfuse-proxy.service"
+  updateService="true"
+  echo "change from /usr/bin/blobfuse-proxy to /usr/local/bin/blobfuse-proxy in blobfuse-proxy.service"
+  sed -i 's/\/usr\/bin\/blobfuse-proxy/\/usr\/local\/bin\/blobfuse-proxy/g' /blobfuse-proxy/blobfuse-proxy.service
+  if [ -f "/host/etc/systemd/system/blobfuse-proxy.service" ];then
+    old=$(sha256sum /host/etc/systemd/system/blobfuse-proxy.service | awk '{print $1}')
+    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
+    if [ "$old" = "$new" ];then
+        updateService="false"
+        echo "no need to update blobfuse-proxy.service"
+    fi
+  fi
+  if [ "$updateService" = "true" ];then
+    echo "copy blobfuse-proxy.service...."
+    mkdir -p /host/etc/systemd/system/
+    cp /blobfuse-proxy/blobfuse-proxy.service /host/etc/systemd/system/blobfuse-proxy.service
   fi
-fi
-if [ "$updateService" = "true" ];then
-  echo "copy blobfuse-proxy.service...."
-  mkdir -p /host/etc/systemd/system/
-  cp /blobfuse-proxy/blobfuse-proxy.service /host/etc/systemd/system/blobfuse-proxy.service
-fi
 
-if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
   if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
     echo "start blobfuse-proxy...."
     $HOST_CMD systemctl daemon-reload

diff --git a/pkg/blobfuse-proxy/install-proxy.sh b/pkg/blobfuse-proxy/install-proxy.sh
@@ -74,39 +74,39 @@ then
   $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
 fi
 
-# install blobfuse-proxy
-updateBlobfuseProxy="true"
-if [ -f "/host/usr/bin/blobfuse-proxy" ];then
-  old=$(sha256sum /host/usr/bin/blobfuse-proxy | awk '{print $1}')
-  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
-  if [ "$old" = "$new" ];then
-    updateBlobfuseProxy="false"
-    echo "no need to update blobfuse-proxy"
+if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
+  # install blobfuse-proxy
+  updateBlobfuseProxy="true"
+  if [ -f "/host/usr/bin/blobfuse-proxy" ];then
+    old=$(sha256sum /host/usr/bin/blobfuse-proxy | awk '{print $1}')
+    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
+    if [ "$old" = "$new" ];then
+      updateBlobfuseProxy="false"
+      echo "no need to update blobfuse-proxy"
+    fi
+  fi
+  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/usr/bin/blobfuse-proxy --force
+    chmod 755 /host/usr/bin/blobfuse-proxy
   fi
-fi
-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/usr/bin/blobfuse-proxy --force
-  chmod 755 /host/usr/bin/blobfuse-proxy
-fi
 
-updateService="true"
-if [ -f "/host/usr/lib/systemd/system/blobfuse-proxy.service" ];then
-  old=$(sha256sum /host/usr/lib/systemd/system/blobfuse-proxy.service | awk '{print $1}')
-  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
-  if [ "$old" = "$new" ];then
-      updateService="false"
-      echo "no need to update blobfuse-proxy.service"
+  updateService="true"
+  if [ -f "/host/usr/lib/systemd/system/blobfuse-proxy.service" ];then
+    old=$(sha256sum /host/usr/lib/systemd/system/blobfuse-proxy.service | awk '{print $1}')
+    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
+    if [ "$old" = "$new" ];then
+        updateService="false"
+        echo "no need to update blobfuse-proxy.service"
+    fi
+  fi
+  if [ "$updateService" = "true" ];then
+    echo "copy blobfuse-proxy.service...."
+    mkdir -p /host/usr/lib/systemd/system
+    cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
   fi
-fi
-if [ "$updateService" = "true" ];then
-  echo "copy blobfuse-proxy.service...."
-  mkdir -p /host/usr/lib/systemd/system
-  cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
-fi
 
-if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
   if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
     echo "start blobfuse-proxy...."
     $HOST_CMD systemctl daemon-reload