Merge pull request #1499 from k8s-infra-cherrypick-robot/cherry-pick-1496-to-release-1.23

andyzhangx · web-flow · commit 9abb4af35ef0 · 2024-07-24T21:34:09.000+08:00
[release-1.23] fix: blobfuse mount failure in Azure Linux v3
diff --git a/pkg/blobfuse-proxy/server/server.go b/pkg/blobfuse-proxy/server/server.go
@@ -121,8 +121,8 @@ func getBlobfuseVersion() BlobfuseVersion {
 		return BlobfuseV1
 	}
 
-	if strings.EqualFold(osinfo.Distro, "mariner") && osinfo.Version >= "2.0" {
-		klog.V(2).Info("proxy default using blobfuse V2 for mounting on Mariner 2.0+")
+	if (strings.EqualFold(osinfo.Distro, "mariner") || strings.EqualFold(osinfo.Distro, "azurelinux")) && osinfo.Version >= "2.0" {
+		klog.V(2).Info("proxy default using blobfuse V2 for mounting on azurelinux(mariner) 2.0+")
 		return BlobfuseV2
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,8 @@ func getBlobfuseVersion() BlobfuseVersion {`
`121`	`121`	`return BlobfuseV1`
`122`	`122`	`}`
`123`	`123`
`124`		`- if strings.EqualFold(osinfo.Distro, "mariner") && osinfo.Version >= "2.0" {`
`125`		`- klog.V(2).Info("proxy default using blobfuse V2 for mounting on Mariner 2.0+")`
	`124`	`+ if (strings.EqualFold(osinfo.Distro, "mariner") \|\| strings.EqualFold(osinfo.Distro, "azurelinux")) && osinfo.Version >= "2.0" {`
	`125`	`+ klog.V(2).Info("proxy default using blobfuse V2 for mounting on azurelinux(mariner) 2.0+")`
`126`	`126`	`return BlobfuseV2`
`127`	`127`	`}`
`128`	`128`