Skip to content

Commit ef9a243

Browse files
authored
Merge pull request #2194 from k8s-infra-cherrypick-robot/cherry-pick-2193-to-release-1.27
[release-1.27] fix: blobfuse-proxy install on OpenShift 4.19
2 parents 8b939dd + bfb9e00 commit ef9a243

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/blobfuse-proxy/init.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ DISTRIBUTION=$($HOST_CMD cat /etc/os-release | grep ^ID= | cut -d'=' -f2 | tr -d
3737
ARCH=$($HOST_CMD uname -m)
3838
echo "Linux distribution: $DISTRIBUTION, Arch: $ARCH"
3939

40-
# install blobfuse-proxy and blobfuse/blofuse2 if needed
40+
# install blobfuse-proxy and blobfuse/blobfuse2 if needed
4141
case "${DISTRIBUTION}" in
42-
"rhcos" | "cos" | "gardenlinux")
42+
"rhcos" | "rhel" | "cos" | "gardenlinux")
4343
. ./blobfuse-proxy/install-proxy-rhcos.sh
4444
;;
4545
*)

pkg/blobfuse-proxy/server/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ func getBlobfuseVersion() BlobfuseVersion {
140140
return BlobfuseV2
141141
}
142142

143-
if strings.EqualFold(osinfo.Distro, "rhcos") {
144-
klog.V(2).Info("proxy default using blobfuse V2 for mounting on RHCOS")
143+
if strings.EqualFold(osinfo.Distro, "rhcos") || strings.EqualFold(osinfo.Distro, "rhel") {
144+
klog.V(2).Info("proxy default using blobfuse V2 for mounting on RHCOS/RHEL")
145145
return BlobfuseV2
146146
}
147147

0 commit comments

Comments
 (0)