Merge pull request #280 from andyzhangx/windows-convert-source-path

fix: convert source path on Windows

Author: andyzhangx

deploy/example/e2e_usage.md

@@ -64,14 +64,15 @@ kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/csi-driver-sm
 ```
  - Execute `df -h` command in the container
 ```console
-# k exec -it statefulset-smb2-0 sh
-# df -h
+kubectl exec -it statefulset-smb2-0 sh -- df -h
+```
+<pre>
 Filesystem                                    Size  Used Avail Use% Mounted on
 ...
 //smb-server.default.svc.cluster.local/share  124G   23G  102G  19% /mnt/smb
 /dev/sda1                                     124G   15G  110G  12% /etc/hosts
 ...
-```
+</pre>
 
 ### Option#2: PV/PVC Usage
 #### 1. Create PV/PVC bound with SMB share
@@ -124,14 +125,16 @@ kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/csi-driver-sm
 
  - Execute `df -h` command in the container
 ```console
-$ kubectl exec -it nginx-smb -- sh
-# df -h
+kubectl exec -it nginx-smb -- df -h
+```
+<pre>
 Filesystem            Size  Used Avail Use% Mounted on
 ...
 /dev/sda1              97G   21G   77G  22% /etc/hosts
 //20.43.191.64/share   97G   21G   77G  22% /mnt/smb
 ...
-```
+</pre>
+
 In the above example, there is a `/mnt/smb` directory mounted as cifs filesystem.
 
 ### 2.2 Create a deployment on Windows

pkg/mounter/safe_mounter_windows.go

@@ -66,20 +66,19 @@ func (mounter *CSIProxyMounter) SMBMount(source, target, fsType string, mountOpt
 
 	if !parentExists {
 		klog.Infof("Parent directory %s does not exists. Creating the directory", parentDir)
-		err := mounter.MakeDir(parentDir)
-		if err != nil {
+		if err := mounter.MakeDir(parentDir); err != nil {
 			return fmt.Errorf("create of parent dir: %s dailed with error: %v", parentDir, err)
 		}
 	}
 
+	source = strings.Replace(source, "/", "\\", -1)
 	smbMountRequest := &smb.NewSmbGlobalMappingRequest{
 		LocalPath:  normalizeWindowsPath(target),
 		RemotePath: source,
 		Username:   mountOptions[0],
 		Password:   sensitiveMountOptions[0],
 	}
-	_, err = mounter.SMBClient.NewSmbGlobalMapping(context.Background(), smbMountRequest)
-	if err != nil {
+	if _, err := mounter.SMBClient.NewSmbGlobalMapping(context.Background(), smbMountRequest); err != nil {
 		return fmt.Errorf("smb mapping failed with error: %v", err)
 	}
 	return nil

test/e2e/dynamic_provisioning_test.go

@@ -62,6 +62,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 
 	testDriver = driver.InitSMBDriver()
 	ginkgo.It("should create a volume after driver restart [smb.csi.k8s.io]", func() {
+		ginkgo.Skip("test case is disabled since node logs would be lost after driver restart")
 		pod := testsuites.PodDetails{
 			Cmd: convertToPowershellCommandIfNecessary("echo 'hello world' >> /mnt/test-1/data && while true; do sleep 3600; done"),
 			Volumes: []testsuites.VolumeDetails{

test/e2e/suite_test.go

@@ -128,7 +128,7 @@ var _ = ginkgo.BeforeSuite(func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		smbPublicIP := strings.TrimSuffix(string(output), "\n")
-		source := `\\` + smbPublicIP + `\share`
+		source := `//` + smbPublicIP + `/share`
 
 		log.Printf("use source on Windows: %v\n", source)
 		defaultStorageClassParameters["source"] = source