support openshift

cvvz · Oct 13, 2023 · e15df33 · e15df33
1 parent f83417a
commit e15df33
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 52 deletions.
diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
@@ -99,6 +99,8 @@ spec:
           volumeMounts:
             - name: host-usr
               mountPath: /host/usr
+            - name: host-usr-local
+              mountPath: /host/usr/local
             - name: host-etc
               mountPath: /host/etc
 {{- end }}
@@ -269,6 +271,9 @@ spec:
         - name: host-usr
           hostPath:
             path: /usr
+        - name: host-usr-local
+          hostPath:
+            path: /usr/local
         - name: host-etc
           hostPath:
             path: /etc

diff --git a/pkg/blobfuse-proxy/blobfuse-proxy.service b/pkg/blobfuse-proxy/blobfuse-proxy.service
@@ -2,7 +2,7 @@
 Description=Blobfuse proxy service
 
 [Service]
-ExecStart=/usr/bin/blobfuse-proxy --v=5 --blobfuse-proxy-endpoint=unix://var/lib/kubelet/plugins/blob.csi.azure.com/blobfuse-proxy.sock
+ExecStart=/usr/local/bin/blobfuse-proxy --v=5 --blobfuse-proxy-endpoint=unix://var/lib/kubelet/plugins/blob.csi.azure.com/blobfuse-proxy.sock
 Delegate=yes
 KillMode=process
 Restart=always

diff --git a/pkg/blobfuse-proxy/init.sh b/pkg/blobfuse-proxy/init.sh
@@ -31,61 +31,68 @@ echo "Linux Arch is $(uname -m)"
 
 if [ "${ARCH}" != "aarch64" ]
 then
-  if [ "${DISTRIBUTION}" = "ubuntu" ] && { [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]; }
+  if [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]
   then
-    release=$($HOST_CMD lsb_release -rs)
-    echo "Ubuntu release: $release"
-
-    if [ "$(expr "$release" \< "22.04")" -eq 1 ]
+    if [ "${DISTRIBUTION}" = "ubuntu" ]
     then
-      cp /blobfuse-proxy/packages-microsoft-prod-18.04.deb /host/etc/packages-microsoft-prod.deb
-    else
-      cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb
-    fi
-
-    # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. 
-    # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
-    yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
-
-    pkg_list=""
-    if [ "${INSTALL_BLOBFUSE}" = "true" ] && [ "$(expr "$release" \< "22.04")" -eq 1 ]
-    then
-      pkg_list="${pkg_list} fuse"
-      # install blobfuse with latest version or specific version
-      if [ -z "${BLOBFUSE_VERSION}" ]; then
-        echo "install blobfuse with latest version"
-        pkg_list="${pkg_list} blobfuse"
+      release=$($HOST_CMD lsb_release -rs)
+      echo "Ubuntu release: $release"
+
+      if [ "$(expr "$release" \< "22.04")" -eq 1 ]
+      then
+        cp /blobfuse-proxy/packages-microsoft-prod-18.04.deb /host/etc/packages-microsoft-prod.deb
       else
-        pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
+        cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb
       fi
-    fi
-
-    if [ "${INSTALL_BLOBFUSE2}" = "true" ]
-    then
-      if [ "$(expr "$release" \< "22.04")" -eq 1 ]; then
-        echo "install fuse for blobfuse2"
+
+      # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. 
+      # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
+      yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
+
+      pkg_list=""
+      if [ "${INSTALL_BLOBFUSE}" = "true" ] && [ "$(expr "$release" \< "22.04")" -eq 1 ]
+      then
         pkg_list="${pkg_list} fuse"
-      else
-        echo "install fuse3 for blobfuse2, current release is $release"
-        pkg_list="${pkg_list} fuse3"
+        # install blobfuse with latest version or specific version
+        if [ -z "${BLOBFUSE_VERSION}" ]; then
+          echo "install blobfuse with latest version"
+          pkg_list="${pkg_list} blobfuse"
+        else
+          pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
+        fi
       fi
 
-      # install blobfuse2 with latest version or specific version
-      if [ -z "${BLOBFUSE2_VERSION}" ]; then
-        echo "install blobfuse2 with latest version"
-        pkg_list="${pkg_list} blobfuse2"
-      else
-        pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
+      if [ "${INSTALL_BLOBFUSE2}" = "true" ]
+      then
+        if [ "$(expr "$release" \< "22.04")" -eq 1 ]; then
+          echo "install fuse for blobfuse2"
+          pkg_list="${pkg_list} fuse"
+        else
+          echo "install fuse3 for blobfuse2, current release is $release"
+          pkg_list="${pkg_list} fuse3"
+        fi
+
+        # install blobfuse2 with latest version or specific version
+        if [ -z "${BLOBFUSE2_VERSION}" ]; then
+          echo "install blobfuse2 with latest version"
+          pkg_list="${pkg_list} blobfuse2"
+        else
+          pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
+        fi
       fi
+      echo "begin to install ${pkg_list}"
+      $HOST_CMD apt-get install -y $pkg_list
+      $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
+    elif [ "${DISTRIBUTION}" = "rhcos" ]
+    then
+      echo "for rhcos, just copy blobfuse2 to the host..."
+      cp /usr/bin/blobfuse2 /host/usr/local/bin/blobfuse2
     fi
-    echo "begin to install ${pkg_list}"
-    $HOST_CMD apt-get install -y $pkg_list
-    $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
   fi
 
   updateBlobfuseProxy="true"
-  if [ -f "/host/usr/bin/blobfuse-proxy" ];then
-    old=$(sha256sum /host/usr/bin/blobfuse-proxy | awk '{print $1}')
+  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"
@@ -95,15 +102,19 @@ then
 
   if [ "$updateBlobfuseProxy" = "true" ];then
     echo "copy blobfuse-proxy...."
-    rm -rf /host/var/lib/kubelet/plugins/blob.csi.azure.com/blobfuse-proxy.sock
-    rm -rf /host/usr/bin/blobfuse-proxy
-    cp /blobfuse-proxy/blobfuse-proxy /host/usr/bin/blobfuse-proxy
-    chmod 755 /host/usr/bin/blobfuse-proxy
+    rm -rf /host/usr/local/bin/blobfuse-proxy
+    # we changed the path of blobfuse-proxy from /usr/bin/blobfuse-proxy to /usr/local/bin/blobfuse-proxy
+    # so clean up the file in old path as well
+    if [ "${DISTRIBUTION}" = "ubuntu" ];then
+      rm -rf /host/usr/bin/blobfuse-proxy
+    fi
+    cp /blobfuse-proxy/blobfuse-proxy /host/usr/local/bin/blobfuse-proxy
+    chmod 755 /host/usr/local/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}')
+  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"
@@ -113,8 +124,13 @@ then
 
   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
+    mkdir -p /host/etc/systemd/system/
+    cp /blobfuse-proxy/blobfuse-proxy.service /host/etc/systemd/system/blobfuse-proxy.service
+    # we changed path of blobfuse-proxy.service from /usr/lib/systemd/system/blobfuse-proxy.service to /etc/systemd/system/blobfuse-proxy.service
+    # so clean up the file in old path as well
+    if [ "${DISTRIBUTION}" = "ubuntu" ];then
+      rm -rf /host/usr/lib/systemd/system/blobfuse-proxy.service
+    fi
   fi
 
   if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then