From e15df3356bb2b5c956f8c4f944562ad02c906357 Mon Sep 17 00:00:00 2001 From: weizhichen <weizhichen@microsoft.com> Date: Fri, 13 Oct 2023 07:27:24 +0000 Subject: [PATCH] support openshift --- charts/latest/blob-csi-driver-v0.0.0.tgz | Bin 5873 -> 5894 bytes .../templates/csi-blob-node.yaml | 5 + pkg/blobfuse-proxy/blobfuse-proxy.service | 2 +- pkg/blobfuse-proxy/init.sh | 118 ++++++++++-------- 4 files changed, 73 insertions(+), 52 deletions(-) diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz index 8ba56091e056733c6f82c910169f1366649b3573..90e46f37fac8a07bc77a7018f7c17234624dbedd 100644 GIT binary patch delta 5782 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 U+cUTS3jhHB|N8q~4FISB09}QPk^lez delta 5739 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 diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml index f7b6a48f3b..7a9f2f5573 100644 --- 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 index 7af6585901..92a37aab38 100644 --- 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 index c0e2ff1c5c..50338ee27f 100755 --- 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