Merge pull request #784 from cvvz/support-blobfuse2

feat: support blobfuse2 on Ubuntu 22.04 node

Author: k8s-ci-robot

go.mod

@@ -38,6 +38,8 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1
 	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/go-ini/ini v1.67.0
+	github.com/pkg/errors v0.9.1
 	github.com/satori/go.uuid v1.2.0
 	k8s.io/apiserver v0.25.2
 )
@@ -85,7 +87,6 @@ require (
 	github.com/opencontainers/runc v1.0.2 // indirect
 	github.com/opencontainers/selinux v1.8.2 // indirect
 	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect

go.sum

@@ -239,6 +239,8 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=

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,7 +23,7 @@ import (
 
 	"k8s.io/klog/v2"
 
-	server "sigs.k8s.io/blob-csi-driver/pkg/blobfuse-proxy/server"
+	"sigs.k8s.io/blob-csi-driver/pkg/blobfuse-proxy/server"
 	csicommon "sigs.k8s.io/blob-csi-driver/pkg/csi-common"
 )
 

pkg/blobfuse-proxy/server/server.go

@@ -27,19 +27,30 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"
 	mount_azure_blob "sigs.k8s.io/blob-csi-driver/pkg/blobfuse-proxy/pb"
+	"sigs.k8s.io/blob-csi-driver/pkg/util"
 )
 
 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{}
+	mountServer := &MountServer{}
+	mountServer.blobfuseVersion = getBlobfuseVersion()
+	return mountServer
 }
 
 // MountAzureBlob mounts an azure blob container to given location
@@ -53,8 +64,15 @@ 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...)
 	output, err := cmd.CombinedOutput()
@@ -84,3 +102,17 @@ func RunGRPCServer(
 	klog.V(2).Infof("Start GRPC server at %s, TLS = %t", listener.Addr().String(), enableTLS)
 	return grpcServer.Serve(listener)
 }
+
+func getBlobfuseVersion() BlobfuseVersion {
+	osinfo, err := util.GetOSInfo("/etc/lsb-release")
+	if err != nil {
+		klog.Warningf("failed to get OS info: %v, default using blobfuse v1", err)
+		return BlobfuseV1
+	}
+
+	if osinfo.Distro == "Ubuntu" && osinfo.Version >= "22.04" {
+		return BlobfuseV2
+	}
+
+	return BlobfuseV1
+}

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"
 

pkg/util/util.go

@@ -21,6 +21,10 @@ import (
 	"os"
 	"strings"
 	"sync"
+
+	"github.com/go-ini/ini"
+	"github.com/pkg/errors"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -155,3 +159,27 @@ func ConvertTagsToMap(tags string) (map[string]string, error) {
 	}
 	return m, nil
 }
+
+type OsInfo struct {
+	Distro  string
+	Version string
+}
+
+const (
+	keyDistribID      = "DISTRIB_ID"
+	keyDistribRelease = "DISTRIB_RELEASE"
+)
+
+func GetOSInfo(f interface{}) (*OsInfo, error) {
+	cfg, err := ini.Load(f)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read %q", f)
+	}
+
+	oi := &OsInfo{}
+	oi.Distro = cfg.Section("").Key(keyDistribID).String()
+	oi.Version = cfg.Section("").Key(keyDistribRelease).String()
+
+	klog.V(2).Infof("get OS info: %v", oi)
+	return oi, nil
+}

pkg/util/util_test.go

@@ -19,6 +19,7 @@ package util
 import (
 	"fmt"
 	"os"
+	"reflect"
 	"testing"
 	"time"
 
@@ -248,3 +249,47 @@ func TestConvertTagsToMap2(t *testing.T) {
 		assert.Equal(t, result, test.expected)
 	}
 }
+
+func TestGetOSInfo(t *testing.T) {
+	type args struct {
+		f interface{}
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *OsInfo
+		wantErr bool
+	}{
+		{
+			name: "file not exist",
+			args: args{
+				f: "/not-exist/not-exist",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "parse os info correctly",
+			args: args{
+				f: []byte("DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=22.04"),
+			},
+			want: &OsInfo{
+				Distro:  "Ubuntu",
+				Version: "22.04",
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GetOSInfo(tt.args.f)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetOSInfo() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("GetOSInfo() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

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