Merge branch 'master' into unit-tests

Author: aarongalang

README.md

@@ -15,7 +15,7 @@ This driver allows Kubernetes to access Azure Storage through one of following m
 ### Container Images & Kubernetes Compatibility:
 |driver version  |Image                                                 | supported k8s version | built-in blobfuse version |
 |----------------|------------------------------------------------------|-----------------------|---------------------------|
-|master branch   |mcr.microsoft.com/k8s/csi/blob-csi:latest             | 1.20+                 | 1.4.4                     |
+|master branch   |mcr.microsoft.com/k8s/csi/blob-csi:latest             | 1.20+                 | 1.4.5                     |
 |v1.15.0         |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.15.0 | 1.20+                 | 1.4.4                     |
 |v1.14.0         |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.14.0 | 1.20+                 | 1.4.4                     |
 |v1.13.0         |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.13.0 | 1.20+                 | 1.4.3                     |

charts/latest/blob-csi-driver-v0.0.0.tgz

@@ -95,7 +95,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get", "list", "create"]
+    verbs: ["get", "create"]
 
 ---
 kind: ClusterRoleBinding

charts/latest/blob-csi-driver/templates/rbac-csi-blob-controller.yaml

@@ -9,7 +9,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get", "list"]
+    verbs: ["get"]
 
 ---
 kind: ClusterRoleBinding

charts/latest/blob-csi-driver/templates/rbac-csi-blob-node.yaml

@@ -118,7 +118,7 @@ node:
   enableBlobfuseProxy: false
   blobfuseProxy:
     installBlobfuse: true
-    blobfuseVersion: 1.4.4
+    blobfuseVersion: 1.4.5
     setMaxOpenFileNum: true
     maxOpenFileNum: "9000000"
     disableUpdateDB: true

charts/latest/blob-csi-driver/values.yaml

@@ -51,7 +51,7 @@ spec:
             - name: INSTALL_BLOBFUSE_PROXY
               value: "true"
             - name: BLOBFUSE_VERSION
-              value: 1.4.4
+              value: 1.4.5
             - name: SET_MAX_OPEN_FILE_NUM
               value: "true"
             - name: MAX_FILE_NUM

deploy/csi-blob-node.yaml

@@ -91,7 +91,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get", "list", "create"]
+    verbs: ["get", "create"]
 
 ---
 kind: ClusterRoleBinding

deploy/rbac-csi-blob-controller.yaml

@@ -13,7 +13,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get", "list"]
+    verbs: ["get"]
 
 ---
 kind: ClusterRoleBinding

deploy/rbac-csi-blob-node.yaml

@@ -51,7 +51,8 @@ k8s-azure-created-by: azure
 pvc-92a4d7f2-f23b-4904-bad4-2cbfcff6e388
 ```
 
- - VolumeId is identifier for the volume generated after volume is created by plugin successfully, the format of VolumeId is: `rg#accountName#containerName#uuid#secretNamespace#subsID`, and if current account is in the same subs as the driver, `subsID` would be empty.
+ - VolumeID(`volumeHandle`) is the identifier for the volume handled by the driver, format of VolumeID: `rg#accountName#containerName#uuid#secretNamespace#subscriptionID`
+ > `uuid`, `secretNamespace`, `subscriptionID` are optional
 
 ### Static Provisioning(bring your own storage container)
   > [blobfuse example](../deploy/example/pv-blobfuse-csi.yaml)

docs/driver-parameters.md

@@ -29,7 +29,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 blobfuse="${BLOBFUSE_VERSION}" && \
+  $HOST_CMD apt-get install -y fuse blobfuse="${BLOBFUSE_VERSION}" && \
   $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
 fi
 

pkg/blobfuse-proxy/init.sh

@@ -20,6 +20,8 @@ import (
 	"bytes"
 	"context"
 	"flag"
+	"io"
+	"os"
 	"testing"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -83,21 +85,9 @@ func TestParseEndpoint(t *testing.T) {
 }
 
 func TestLogGRPC(t *testing.T) {
-	// SET UP
-	klog.InitFlags(nil)
-	if e := flag.Set("logtostderr", "false"); e != nil {
-		t.Error(e)
-	}
-	if e := flag.Set("alsologtostderr", "false"); e != nil {
-		t.Error(e)
-	}
-	if e := flag.Set("v", "100"); e != nil {
-		t.Error(e)
-	}
-	flag.Parse()
-
 	buf := new(bytes.Buffer)
 	klog.SetOutput(buf)
+	defer klog.SetOutput(io.Discard)
 
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) { return nil, nil }
 	info := grpc.UnaryServerInfo{
@@ -232,3 +222,12 @@ func TestGetLogLevel(t *testing.T) {
 		}
 	}
 }
+
+func TestMain(m *testing.M) {
+	klog.InitFlags(nil)
+	_ = flag.Set("logtostderr", "false")
+	_ = flag.Set("alsologtostderr", "false")
+	_ = flag.Set("v", "100")
+	klog.SetOutput(io.Discard)
+	os.Exit(m.Run())
+}

pkg/csi-common/utils_test.go

@@ -203,5 +203,46 @@ func TestConvertTagsToMap(t *testing.T) {
 		output, err := ConvertTagsToMap(test.tags)
 		assert.Equal(t, test.expectedOut, output, test.desc)
 		assert.Equal(t, test.expectedErr, err, test.desc)
+=======
+	type StringMap map[string]string
+	tests := []struct {
+		tags     string
+		expected map[string]string
+		err      bool
+	}{
+		{
+			tags:     "",
+			expected: StringMap{},
+			err:      false,
+		},
+		{
+			tags:     "key1=value1, key2=value2,key3= value3",
+			expected: StringMap{"key1": "value1", "key2": "value2", "key3": "value3"},
+			err:      false,
+		},
+		{
+			tags:     " key = value ",
+			expected: StringMap{"key": "value"},
+			err:      false,
+		},
+		{
+			tags:     "keyvalue",
+			expected: nil,
+			err:      true,
+		},
+		{
+			tags:     " = value,=",
+			expected: nil,
+			err:      true,
+		},
+	}
+	for _, test := range tests {
+		result, err := ConvertTagsToMap(test.tags)
+		if test.err {
+			assert.NotNil(t, err)
+		} else {
+			assert.Nil(t, err)
+		}
+		assert.Equal(t, result, test.expected)
 	}
 }