Merge pull request #914 from hwdef/master

k8s-ci-robot · web-flow · commit ee5fdb14d76f · 2022-05-02T10:37:14.000-07:00
update containerd socket in windows
diff --git a/cmd/crictl/main_windows.go b/cmd/crictl/main_windows.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 )
 
-var defaultRuntimeEndpoints = []string{"npipe:////./pipe/dockershim", "npipe:////./pipe/containerd", "npipe:////./pipe/crio", "npipe:////./pipe/cri-dockerd"}
+var defaultRuntimeEndpoints = []string{"npipe:////./pipe/dockershim", "npipe:////./pipe/containerd-containerd", "npipe:////./pipe/cri-dockerd"}
 var defaultConfigPath string
 
 var shutdownSignals = []os.Signal{os.Interrupt}
diff --git a/docs/crictl.md b/docs/crictl.md
@@ -73,8 +73,7 @@ crictl by default connects on Unix to:
 or on Windows to:
 
 - `npipe:////./pipe/dockershim` or
-- `npipe:////./pipe/containerd` or
-- `npipe:////./pipe/crio` or
+- `npipe:////./pipe/containerd-containerd` or
 - `npipe:////./pipe/cri-dockerd`
 
 For other runtimes, use:

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"path/filepath"`
`24`	`24`	`)`
`25`	`25`
`26`		`-var defaultRuntimeEndpoints = []string{"npipe:////./pipe/dockershim", "npipe:////./pipe/containerd", "npipe:////./pipe/crio", "npipe:////./pipe/cri-dockerd"}`
	`26`	`+var defaultRuntimeEndpoints = []string{"npipe:////./pipe/dockershim", "npipe:////./pipe/containerd-containerd", "npipe:////./pipe/cri-dockerd"}`
`27`	`27`	`var defaultConfigPath string`
`28`	`28`
`29`	`29`	`var shutdownSignals = []os.Signal{os.Interrupt}`