Skip to content

Commit 3025264

Browse files
cvvzk8s-infra-cherrypick-robot
authored andcommitted
fix: support install blobfuse proxy on other linux distributions
1 parent c18c197 commit 3025264

File tree

4 files changed

+7
-74
lines changed

4 files changed

+7
-74
lines changed

pkg/blobfuse-proxy/init.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ echo "Linux distribution: $DISTRIBUTION, Arch: $ARCH"
3030

3131
# install blobfuse-proxy and blobfuse/blofuse2 if needed
3232
case "${DISTRIBUTION}" in
33-
"ubuntu")
34-
. ./blobfuse-proxy/install-proxy-ubuntu.sh
35-
;;
3633
"rhcos")
3734
. ./blobfuse-proxy/install-proxy-rhcos.sh
3835
;;
39-
"mariner")
40-
. ./blobfuse-proxy/install-proxy-mariner.sh
41-
;;
4236
*)
43-
echo "Unsupported distribution: ${DISTRIBUTION}"
37+
. ./blobfuse-proxy/install-proxy.sh
4438
;;
4539
esac
4640

pkg/blobfuse-proxy/install-proxy-mariner.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

pkg/blobfuse-proxy/install-proxy-ubuntu.sh renamed to pkg/blobfuse-proxy/install-proxy.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
set -xe
1818

1919
# install blobfuse/blobfuse2
20-
if [ "${ARCH}" = "aarch64" ]
20+
if [ "${DISTRIBUTION}" != "ubuntu" ]
21+
then
22+
echo "skip install blobfuse/blobfuse2 for ${DISTRIBUTION}...."
23+
elif [ "${ARCH}" = "aarch64" ]
2124
then
2225
echo "skip install blobfuse/blobfuse2 for arm64...."
2326
elif [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]

pkg/blobplugin/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,14 @@ COPY ${binary} /blobplugin
2121
RUN mkdir /blobfuse-proxy/
2222

2323
COPY ./pkg/blobfuse-proxy/init.sh /blobfuse-proxy/
24-
COPY ./pkg/blobfuse-proxy/install-proxy-ubuntu.sh /blobfuse-proxy/
24+
COPY ./pkg/blobfuse-proxy/install-proxy.sh /blobfuse-proxy/
2525
COPY ./pkg/blobfuse-proxy/install-proxy-rhcos.sh /blobfuse-proxy/
26-
COPY ./pkg/blobfuse-proxy/install-proxy-mariner.sh /blobfuse-proxy/
2726
COPY ./pkg/blobfuse-proxy/blobfuse-proxy.service /blobfuse-proxy/
2827
COPY ./_output/${ARCH}/blobfuse-proxy /blobfuse-proxy/
2928

3029
RUN chmod +x /blobfuse-proxy/init.sh && \
31-
chmod +x /blobfuse-proxy/install-proxy-ubuntu.sh && \
3230
chmod +x /blobfuse-proxy/install-proxy-rhcos.sh && \
33-
chmod +x /blobfuse-proxy/install-proxy-mariner.sh && \
31+
chmod +x /blobfuse-proxy/install-proxy.sh && \
3432
chmod +x /blobfuse-proxy/blobfuse-proxy.service && \
3533
chmod +x /blobfuse-proxy/blobfuse-proxy
3634

0 commit comments

Comments
 (0)