Switch Windows default runtime endpoints to npipe

Refer kubernetes/kubernetes#69516.

cmd/crictl/main.go

@@ -28,6 +28,7 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri"
 	"k8s.io/kubernetes/pkg/kubelet/remote"
+	"k8s.io/kubernetes/pkg/kubelet/util"
 
 	"github.com/kubernetes-sigs/cri-tools/pkg/version"
 )
@@ -52,7 +53,7 @@ func getRuntimeClientConnection(context *cli.Context) (*grpc.ClientConn, error)
 		return nil, fmt.Errorf("--runtime-endpoint is not set")
 	}
 
-	addr, dialer, err := GetAddressAndDialer(RuntimeEndpoint)
+	addr, dialer, err := util.GetAddressAndDialer(RuntimeEndpoint)
 	if err != nil {
 		return nil, err
 	}

cmd/crictl/main_unix.go

@@ -18,30 +18,7 @@ limitations under the License.
 
 package main
 
-import (
-	"net"
-	"time"
-
-	"k8s.io/kubernetes/pkg/kubelet/util"
-)
-
 const (
 	defaultConfigPath      = "/etc/crictl.yaml"
 	defaultRuntimeEndpoint = "unix:///var/run/dockershim.sock"
 )
-
-// GetAddressAndDialer returns the address and a dialer for the endpoint
-// protocol.
-//
-// On Unix supported protocols are unix sockets.
-//
-// Examples:
-//
-// An endpoint of "unix:///var/run/dockershim.sock" returns address
-// "/var/run/dockershim.sock" and a unix socket dialer for this address.
-//
-// An endpoint of "/var/run/dockershim.sock" returns address
-// "/var/run/dockershim.sock" and a unix socket dialer for this address.
-func GetAddressAndDialer(endpoint string) (string, func(addr string, timeout time.Duration) (net.Conn, error), error) {
-	return util.GetAddressAndDialer(endpoint)
-}

cmd/crictl/main_windows.go

@@ -19,45 +19,16 @@ limitations under the License.
 package main
 
 import (
-	"net"
 	"os"
 	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/Microsoft/go-winio"
-	"k8s.io/kubernetes/pkg/kubelet/util"
 )
 
 const (
-	defaultRuntimeEndpoint = "tcp://localhost:3735"
+	defaultRuntimeEndpoint = "npipe:////./pipe/dockershim"
 )
 
 var defaultConfigPath string
 
 func init() {
 	defaultConfigPath = filepath.Join(os.Getenv("USERPROFILE"), ".crictl", "crictl.yaml")
 }
-
-// GetAddressAndDialer returns the address and a dialer for the endpoint
-// protocol.
-//
-// On Windows supported protocols are Windows named pipes and tcp.
-//
-// Examples:
-//
-// An endpoint of "tcp://localhost:3735" returns address "localhost:3735" and a
-// tcp socket dialer for this address.
-//
-// An endpoint of "\\.\pipe\name" returns an address of "\\.\pipe\name" and a
-// Windows named pipe dialer for this address.
-func GetAddressAndDialer(endpoint string) (string, func(addr string, timeout time.Duration) (net.Conn, error), error) {
-	if strings.HasPrefix(endpoint, "\\\\.\\pipe") {
-		return endpoint, dial, nil
-	}
-	return util.GetAddressAndDialer(endpoint)
-}
-
-func dial(addr string, timeout time.Duration) (net.Conn, error) {
-	return winio.DialPipe(addr, &timeout)
-}

pkg/framework/test_context.go

@@ -61,7 +61,7 @@ func RegisterFlags() {
 
 	svcaddr := "unix:///var/run/dockershim.sock"
 	if runtime.GOOS == "windows" {
-		svcaddr = "tcp://localhost:3735"
+		svcaddr = "npipe:////./pipe/dockershim"
 	}
 	flag.StringVar(&TestContext.RuntimeServiceAddr, "runtime-endpoint", svcaddr, "Runtime service socket for client to connect..")
 	flag.DurationVar(&TestContext.RuntimeServiceTimeout, "runtime-service-timeout", 300*time.Second, "Timeout when trying to connect to a runtime service.")