Adds npipe support for Windows connections

Signed-off-by: Justin Terry (VM) <[email protected]>

Author: jterry75

pkg/kubelet/util/util.go

@@ -19,6 +19,7 @@ package util
 import (
 	"fmt"
 	"net/url"
+	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -32,13 +33,24 @@ func FromApiserverCache(opts *metav1.GetOptions) {
 func parseEndpoint(endpoint string) (string, string, error) {
 	u, err := url.Parse(endpoint)
 	if err != nil {
+		// Check that endpoint wasn't passed in the form \\.\pipe
+		if strings.HasPrefix(endpoint, "\\\\.\\pipe") {
+			return "npipe", endpoint, nil
+		}
 		return "", "", err
 	}
 
 	if u.Scheme == "tcp" {
 		return "tcp", u.Host, nil
 	} else if u.Scheme == "unix" {
 		return "unix", u.Path, nil
+	} else if u.Scheme == "npipe" {
+		host := u.Host
+		if host == "" {
+			host = "."
+		}
+		// u.Path will always have a leading / or it will be empty from the Parse.
+		return "npipe", fmt.Sprintf("\\\\%s%s", host, strings.Replace(u.Path, "/", "\\", -1)), nil
 	} else if u.Scheme == "" {
 		return "", "", fmt.Errorf("Using %q as endpoint is deprecated, please consider using full url format", endpoint)
 	} else {

pkg/kubelet/util/util_test.go

@@ -39,6 +39,21 @@ func TestParseEndpoint(t *testing.T) {
 			expectedProtocol: "tcp",
 			expectedAddr:     "localhost:15880",
 		},
+		{
+			endpoint:         "npipe://./pipe/mypipe",
+			expectedProtocol: "npipe",
+			expectedAddr:     "\\\\.\\pipe\\mypipe",
+		},
+		{
+			endpoint:         "npipe:/pipe/mypipe2",
+			expectedProtocol: "npipe",
+			expectedAddr:     "\\\\.\\pipe\\mypipe2",
+		},
+		{
+			endpoint:         "\\\\.\\pipe\\mypipe3",
+			expectedProtocol: "npipe",
+			expectedAddr:     "\\\\.\\pipe\\mypipe3",
+		},
 		{
 			endpoint:         "tcp1://abc",
 			expectedProtocol: "tcp1",

pkg/kubelet/util/util_windows.go

@@ -22,31 +22,42 @@ import (
 	"fmt"
 	"net"
 	"time"
+
+	"github.com/Microsoft/go-winio"
 )
 
 const (
-	tcpProtocol = "tcp"
+	tcpProtocol   = "tcp"
+	npipeProtocol = "npipe"
 )
 
 func CreateListener(endpoint string) (net.Listener, error) {
 	protocol, addr, err := parseEndpoint(endpoint)
 	if err != nil {
 		return nil, err
 	}
-	if protocol != tcpProtocol {
-		return nil, fmt.Errorf("only support tcp endpoint")
+	switch protocol {
+	case tcpProtocol:
+		return net.Listen(protocol, addr)
+	case npipeProtocol:
+		return winio.ListenPipe(addr, nil)
+	default:
+		return nil, fmt.Errorf("only support tcp or npipe endpoint")
 	}
-
-	return net.Listen(protocol, addr)
 }
 
 func GetAddressAndDialer(endpoint string) (string, func(addr string, timeout time.Duration) (net.Conn, error), error) {
 	protocol, addr, err := parseEndpoint(endpoint)
 	if err != nil {
 		return "", nil, err
 	}
-	if protocol != tcpProtocol {
-		return "", nil, fmt.Errorf("only support tcp endpoint")
+	switch protocol {
+	case tcpProtocol:
+		return addr, dial, nil
+	case npipeProtocol:
+		return addr, dialPipe, nil
+	default:
+		return "", nil, fmt.Errorf("only support tcp or npipe endpoint")
 	}
 
 	return addr, dial, nil
@@ -55,3 +66,7 @@ func GetAddressAndDialer(endpoint string) (string, func(addr string, timeout tim
 func dial(addr string, timeout time.Duration) (net.Conn, error) {
 	return net.DialTimeout(tcpProtocol, addr, timeout)
 }
+
+func dialPipe(addr string, timeout time.Duration) (net.Conn, error) {
+	return winio.DialPipe(addr, &timeout)
+}