support blobfuse2

Author: cvvz

go.mod

@@ -39,6 +39,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.0.0
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
 	github.com/satori/go.uuid v1.2.0
+	github.com/zcalusic/sysinfo v0.9.5
 	k8s.io/apiserver v0.25.2
 )
 

go.sum

@@ -649,6 +649,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zcalusic/sysinfo v0.9.5 h1:ivoHyj9aIAYkwzo1+8QgJ5s4oeE6Etx9FmZtqa4wJjQ=
+github.com/zcalusic/sysinfo v0.9.5/go.mod h1:Z/gPVufBrFc8X5sef3m6kkw3r3nlNFp+I6bvASfvBZQ=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=

pkg/blob/nodeserver.go

@@ -166,9 +166,14 @@ func (d *Driver) mountBlobfuseWithProxy(args string, authEnv []string) (string,
 
 func (d *Driver) mountBlobfuseInsideDriver(args string, authEnv []string) (string, error) {
 	klog.V(2).Infof("mounting blobfuse inside driver")
-	cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
+	// TODO: revert to blobfuse
+	args = "mount " + args
+	cmd := exec.Command("blobfuse2", strings.Split(args, " ")...)
 	cmd.Env = append(os.Environ(), authEnv...)
+	klog.Infof("xxxxxxxxxxxxxxx args %v", args)
+	klog.Infof("xxxxxxxxxxxxxxx authEnv %v", authEnv)
 	output, err := cmd.CombinedOutput()
+	klog.Infof("xxxxxxxxxxxxxxx output %v", string(output))
 	return string(output), err
 }
 

pkg/blobfuse-proxy/init.sh

@@ -31,7 +31,7 @@ then
   cp /blobfuse-proxy/packages-microsoft-prod.deb /host/etc/
   $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && \
   $HOST_CMD apt update && \
-  $HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}" && \
+  $HOST_CMD apt-get install -y fuse blobfuse2 blobfuse="${BLOBFUSE_VERSION}" && \
   $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
 fi
 

pkg/blobfuse-proxy/main.go

@@ -23,6 +23,7 @@ import (
 
 	"k8s.io/klog/v2"
 
+	"github.com/zcalusic/sysinfo"
 	server "sigs.k8s.io/blob-csi-driver/pkg/blobfuse-proxy/server"
 	csicommon "sigs.k8s.io/blob-csi-driver/pkg/csi-common"
 )
@@ -55,10 +56,20 @@ func main() {
 		klog.Fatal("cannot start server:", err)
 	}
 
-	mountServer := server.NewMountServiceServer()
+	mountServer := server.NewMountServiceServer(getBlobfuseVersion())
 
 	klog.V(2).Info("Listening for connections on address: %v\n", listener.Addr())
 	if err = server.RunGRPCServer(mountServer, false, listener); err != nil {
 		klog.Fatalf("Error running grpc server. Error: %v", listener.Addr(), err)
 	}
 }
+
+func getBlobfuseVersion() server.BlobfuseVersion {
+	var si sysinfo.SysInfo
+	si.GetSysInfo()
+	klog.V(2).Infof("OS info: %+v", si.OS)
+	if si.OS.Vendor == "ubuntu" && si.OS.Release >= "22.04" {
+		return server.BlobfuseV2
+	}
+	return server.BlobfuseV1
+}

pkg/blobfuse-proxy/server/server.go

@@ -33,13 +33,23 @@ var (
 	mutex sync.Mutex
 )
 
+type BlobfuseVersion int
+
+const (
+	BlobfuseV1 BlobfuseVersion = iota
+	BlobfuseV2
+)
+
 type MountServer struct {
+	blobfuseVersion BlobfuseVersion
 	mount_azure_blob.UnimplementedMountServiceServer
 }
 
 // NewMountServer returns a new Mountserver
-func NewMountServiceServer() *MountServer {
-	return &MountServer{}
+func NewMountServiceServer(ver BlobfuseVersion) *MountServer {
+	return &MountServer{
+		blobfuseVersion: ver,
+	}
 }
 
 // MountAzureBlob mounts an azure blob container to given location
@@ -53,11 +63,21 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
 	authEnv := req.GetAuthEnv()
 	klog.V(2).Infof("received mount request: Mounting with args %v \n", args)
 
+	var cmd *exec.Cmd
 	var result mount_azure_blob.MountAzureBlobResponse
-	cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
+	switch server.blobfuseVersion {
+	case BlobfuseV1:
+		cmd = exec.Command("blobfuse", strings.Split(args, " ")...)
+	case BlobfuseV2:
+		args = "mount " + args
+		cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
+	}
 
 	cmd.Env = append(cmd.Env, authEnv...)
+	klog.Infof("zzzzzzzzzzzzzzz args %v", args)
+	klog.Infof("zzzzzzzzzzzzzzz authEnv %v", authEnv)
 	output, err := cmd.CombinedOutput()
+	klog.Infof("zzzzzzzzzzzzzzz output %v", string(output))
 	if err != nil {
 		klog.Error("blobfuse mount failed: with error:", err.Error())
 	} else {

pkg/blobfuse-proxy/server/server_test.go

@@ -48,7 +48,7 @@ func TestServerMountAzureBlob(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			mountServer := NewMountServiceServer()
+			mountServer := NewMountServiceServer(BlobfuseV1)
 			req := mount_azure_blob.MountAzureBlobRequest{
 				MountArgs: tc.args,
 				AuthEnv:   tc.authEnv,

pkg/blobplugin/Dockerfile

@@ -34,7 +34,7 @@ ARG ARCH=amd64
 RUN if [ "$ARCH" = "amd64" ] ; then \
   clean-install libcurl4-gnutls-dev && \
   wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
-  dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y && apt remove wget -y; fi
+  dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse blobfuse2 fuse -y && apt remove wget -y; fi
 LABEL maintainers="andyzhangx"
 LABEL description="Azure Blob Storage CSI driver"
 

test/e2e/testsuites/pre_provisioned_provided_credentials_tester.go

@@ -80,6 +80,9 @@ func (t *PreProvisionedProvidedCredentiasTest) Run(client clientset.Interface, n
 
 			// test for storage account SAS token
 			ginkgo.By("Run for storage account SAS token")
+			pod.Volumes[n].Attrib = map[string]string{
+				"azurestorageauthtype": "SAS",
+			}
 			sasToken := GenerateSASToken(accountName, accountKey)
 			secretData = map[string]string{
 				"azurestorageaccountname":     accountName,

test/e2e/testsuites/pre_provisioned_sastoken_tester.go

@@ -71,6 +71,7 @@ func (t *PreProvisionedSASTokenTest) Run(client clientset.Interface, namespace *
 			pod.Volumes[n].Attrib["storageAccountName"] = accountName
 			pod.Volumes[n].Attrib["keyVaultURL"] = *vault.Properties.VaultURI
 			pod.Volumes[n].Attrib["keyVaultSecretName"] = *accountSASSecret.Name
+			pod.Volumes[n].Attrib["azurestorageauthtype"] = "SAS"
 
 			tpod, cleanup := pod.SetupWithPreProvisionedVolumes(client, namespace, t.CSIDriver)
 			// defer must be called here for resources not get removed before using them