From bf7fd015f785d7e827f78dddcd274c1f05879059 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 15 Jul 2020 14:28:48 +0200 Subject: [PATCH] Remove unused useShimV2() This function was removed in the Linux code as part of f63f73a4a8f531813d6b46a2347cab4bfd210df7, but was not removed in the Windows code. Signed-off-by: Sebastiaan van Stijn --- daemon/daemon_windows.go | 4 ---- libcontainerd/libcontainerd_windows.go | 1 - 2 files changed, 5 deletions(-) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 5222b05e0f..aee48d39c3 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -654,10 +654,6 @@ func (daemon *Daemon) initRuntimes(_ map[string]types.Runtime) error { func setupResolvConf(config *config.Config) { } -func (daemon *Daemon) useShimV2() bool { - return true -} - // RawSysInfo returns *sysinfo.SysInfo . func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo { return sysinfo.New(quiet) diff --git a/libcontainerd/libcontainerd_windows.go b/libcontainerd/libcontainerd_windows.go index e7f0bc9d30..61f19ba087 100644 --- a/libcontainerd/libcontainerd_windows.go +++ b/libcontainerd/libcontainerd_windows.go @@ -13,7 +13,6 @@ import ( // 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) { if !system.ContainerdRuntimeSupported() { - // useShimV2 is ignored for windows return local.NewClient(ctx, cli, stateDir, ns, b) } return remote.NewClient(ctx, cli, stateDir, ns, b)