make windows e2e tests work

kubernetes-csi · Jun 1, 2021 · 4016069 · 4016069
1 parent 70eaf79
commit 4016069
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/charts/latest/csi-driver-smb-v0.7.0.tgz b/charts/latest/csi-driver-smb-v0.7.0.tgz
diff --git a/deploy/csi-smb-controller.yaml b/deploy/csi-smb-controller.yaml
@@ -14,6 +14,7 @@ spec:
       labels:
         app: csi-smb-controller
     spec:
+      dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: csi-smb-controller-sa
       nodeSelector:
         kubernetes.io/os: linux
@@ -89,6 +90,8 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+          securityContext:
+            privileged: true
           volumeMounts:
             - mountPath: /csi
               name: socket-dir

diff --git a/pkg/smb/smb_common_windows.go b/pkg/smb/smb_common_windows.go
@@ -24,19 +24,13 @@ import (
 	"k8s.io/klog/v2"
 	mount "k8s.io/mount-utils"
 	"os"
-	"strings"
 )
 
-func normalizeWindowsPath(path string) string {
-	return strings.Replace(path, "/", "\\", -1)
-}
-
 func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, mountOptions, sensitiveMountOptions []string) error {
 	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
 	if !ok {
 		return fmt.Errorf("could not cast to csi proxy class")
 	}
-	source = normalizeWindowsPath(source)
 	return proxy.SMBMount(source, target, fsType, mountOptions, sensitiveMountOptions)
 }