Explorar o código

Merge pull request #41214 from thaJeztah/remove_unused_v2

Remove unused useShimV2()
Akihiro Suda %!s(int64=5) %!d(string=hai) anos
pai
achega
95a8e9ff19
Modificáronse 2 ficheiros con 0 adicións e 5 borrados
  1. 0 4
      daemon/daemon_windows.go
  2. 0 1
      libcontainerd/libcontainerd_windows.go

+ 0 - 4
daemon/daemon_windows.go

@@ -654,10 +654,6 @@ func (daemon *Daemon) initRuntimes(_ map[string]types.Runtime) error {
 func setupResolvConf(config *config.Config) {
 func setupResolvConf(config *config.Config) {
 }
 }
 
 
-func (daemon *Daemon) useShimV2() bool {
-	return true
-}
-
 // RawSysInfo returns *sysinfo.SysInfo .
 // RawSysInfo returns *sysinfo.SysInfo .
 func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo {
 func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo {
 	return sysinfo.New(quiet)
 	return sysinfo.New(quiet)

+ 0 - 1
libcontainerd/libcontainerd_windows.go

@@ -13,7 +13,6 @@ import (
 // NewClient creates a new libcontainerd client from a containerd client
 // NewClient creates a new libcontainerd client from a containerd client
 func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {
 func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {
 	if !system.ContainerdRuntimeSupported() {
 	if !system.ContainerdRuntimeSupported() {
-		// useShimV2 is ignored for windows
 		return local.NewClient(ctx, cli, stateDir, ns, b)
 		return local.NewClient(ctx, cli, stateDir, ns, b)
 	}
 	}
 	return remote.NewClient(ctx, cli, stateDir, ns, b)
 	return remote.NewClient(ctx, cli, stateDir, ns, b)