Merge pull request #285 from andyzhangx/refactor

chore: a little cleanup

Author: andyzhangx

deploy/example/storageclass-smb.yaml

@@ -14,8 +14,7 @@ parameters:
   csi.storage.k8s.io/node-stage-secret-namespace: "default"
   csi.storage.k8s.io/provisioner-secret-name: "smbcreds"
   csi.storage.k8s.io/provisioner-secret-namespace: "default"
-  createSubDir: "true"  # optional: create a sub dir for new volume
-reclaimPolicy: Retain  # only retain is supported
+  createSubDir: "true"  # create a sub dir for new volume, "true" by default
 volumeBindingMode: Immediate
 mountOptions:
   - dir_mode=0777

pkg/smb/controllerserver.go

@@ -75,16 +75,18 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 
 	// check if create SubDir is enable in storage class parameters
 	parameters := req.GetParameters()
-	var createSubDir string
+	createSubDir := true
 	for k, v := range parameters {
 		switch strings.ToLower(k) {
 		case createSubDirField:
-			createSubDir = v
+			if v == "false" {
+				createSubDir = false
+			}
 		}
 	}
 
 	secrets := req.GetSecrets()
-	if strings.EqualFold(createSubDir, "true") {
+	if createSubDir {
 		if len(secrets) > 0 {
 			// Mount smb base share so we can create a subdirectory
 			if err := d.internalMount(ctx, smbVol, volCap, secrets); err != nil {

test/external-e2e/run.sh

@@ -28,9 +28,8 @@ setup_e2e_binaries() {
     curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.21.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz
     tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
 
-    # install csi driver smb
+    # install csi driver
     mkdir -p /tmp/csi && cp deploy/example/storageclass-smb.yaml /tmp/csi/storageclass.yaml
-    sed -i 's/Retain/Delete/g' /tmp/csi/storageclass.yaml
     make e2e-bootstrap
     make install-smb-provisioner
     make create-metrics-svc

test/integration/run-test.sh

@@ -55,7 +55,7 @@ trap cleanup EXIT
 sleep 5
 # set secret for csc node stage
 export X_CSI_SECRETS=username=username,"password=test"
-params='source="//0.0.0.0/share",createSubDir="true"'
+params='source=//0.0.0.0/share,createSubDir="true"'
 # Begin to run CSI functions one by one
 echo 'Create volume test:'
 readonly value=$("$CSC_BIN" controller new --endpoint "$endpoint" --cap 1,block "$volname" --req-bytes 2147483648 --params "$params")