Merge pull request #309 from lizhuqi/convert-name-to-ip

resolve name to ip before passing to csi-proxy

Author: k8s-ci-robot

deploy/example/smb-provisioner/README.md

@@ -15,7 +15,6 @@ kubectl create secret generic smbcreds --from-literal username=USERNAME --from-l
 kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/deploy/example/smb-provisioner/smb-server.yaml
 ```
  - Access by Windows node
-> Since `smb-server.default.svc.cluster.local` could not be recognized by CSI proxy on Windows node, above `smb-server-lb.yaml` configures `LoadBalancer` as `Service.type`, and then configure public IP address for `source` in storage class
 ```console
 kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/deploy/example/smb-provisioner/smb-server-lb.yaml
 ```

pkg/mounter/safe_mounter_windows.go

@@ -21,6 +21,7 @@ package mounter
 import (
 	"context"
 	"fmt"
+	"net"
 	"os"
 	filepath "path/filepath"
 	"strings"
@@ -71,6 +72,19 @@ func (mounter *CSIProxyMounter) SMBMount(source, target, fsType string, mountOpt
 		}
 	}
 
+	parts := strings.FieldsFunc(source, Split)
+	if len(parts) > 0 && strings.HasSuffix(parts[0], "svc.cluster.local") {
+		// replace hostname with IP in the source
+		domainName := parts[0]
+		ip, err := net.ResolveIPAddr("ip4", domainName)
+		if err != nil {
+			klog.Warningf("could not resolve name to IPv4 address for host %s, failed with error: %v", domainName, err)
+		} else {
+			klog.V(2).Infof("resolve the name of host %s to IPv4 address: %s", domainName, ip.String())
+			source = strings.Replace(source, domainName, ip.String(), 1)
+		}
+	}
+
 	source = strings.Replace(source, "/", "\\", -1)
 	smbMountRequest := &smb.NewSmbGlobalMappingRequest{
 		LocalPath:  normalizeWindowsPath(target),
@@ -107,6 +121,10 @@ func (mounter *CSIProxyMounter) Mount(source string, target string, fstype strin
 	return nil
 }
 
+func Split(r rune) bool {
+	return r == ' ' || r == '/'
+}
+
 // Rmdir - delete the given directory
 // TODO: Call separate rmdir for pod context and plugin context. v1alpha1 for CSI
 //       proxy does a relaxed check for prefix as c:\var\lib\kubelet, so we can do

test/e2e/suite_test.go

@@ -113,20 +113,6 @@ var _ = ginkgo.BeforeSuite(func() {
 			err := os.Chdir("test/e2e")
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
-
-		getSMBPublicIPScript := "test/utils/get_smb_svc_public_ip.sh"
-		log.Printf("run script: %s\n", getSMBPublicIPScript)
-
-		cmd := exec.Command("bash", getSMBPublicIPScript)
-		output, err := cmd.CombinedOutput()
-		log.Printf("got output: %v, error: %v\n", string(output), err)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-		smbPublicIP := strings.TrimSuffix(string(output), "\n")
-		source := `//` + smbPublicIP + `/share`
-
-		log.Printf("use source on Windows: %v\n", source)
-		defaultStorageClassParameters["source"] = source
 	}
 })