Merge pull request #2725 from AkihiroSuda/netmgr-remove-unused-var

cniNetworkManager: move Windows-specific variable to `_windows.go`

Author: AkihiroSuda

pkg/containerutil/container_network_manager.go

@@ -30,7 +30,6 @@ import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/oci"
-	"github.com/containerd/containerd/pkg/netns"
 	"github.com/containerd/nerdctl/pkg/api/types"
 	"github.com/containerd/nerdctl/pkg/clientutil"
 	"github.com/containerd/nerdctl/pkg/dnsutil/hostsstore"
@@ -128,7 +127,7 @@ func NewNetworkingOptionsManager(globalOptions types.GlobalCommandOptions, netOp
 	case nettype.Container:
 		manager = &containerNetworkManager{globalOptions, netOpts, client}
 	case nettype.CNI:
-		manager = &cniNetworkManager{globalOptions, netOpts, nil, client}
+		manager = &cniNetworkManager{globalOptions, netOpts, client, cniNetworkManagerPlatform{}}
 	default:
 		return nil, fmt.Errorf("unexpected container networking type: %q", netType)
 	}
@@ -471,8 +470,8 @@ func (m *hostNetworkManager) ContainerNetworkingOpts(_ context.Context, containe
 type cniNetworkManager struct {
 	globalOptions types.GlobalCommandOptions
 	netOpts       types.NetworkOptions
-	netNs         *netns.NetNS
 	client        *containerd.Client
+	cniNetworkManagerPlatform
 }
 
 // NetworkOptions Returns a copy of the internal types.NetworkOptions.

pkg/containerutil/container_network_manager_linux.go

@@ -34,6 +34,9 @@ import (
 	"github.com/containerd/nerdctl/pkg/rootlessutil"
 )
 
+type cniNetworkManagerPlatform struct {
+}
+
 // Verifies that the internal network settings are correct.
 func (m *cniNetworkManager) VerifyNetworkOptions(_ context.Context) error {
 	e, err := netutil.NewCNIEnv(m.globalOptions.CNIPath, m.globalOptions.CNINetConfPath, netutil.WithDefaultNetwork())

pkg/containerutil/container_network_manager_other.go

@@ -28,6 +28,9 @@ import (
 	"github.com/containerd/nerdctl/pkg/api/types"
 )
 
+type cniNetworkManagerPlatform struct {
+}
+
 // Verifies that the internal network settings are correct.
 func (m *cniNetworkManager) VerifyNetworkOptions(_ context.Context) error {
 	return fmt.Errorf("CNI networking currently unsupported on %s", runtime.GOOS)

pkg/containerutil/container_network_manager_windows.go

@@ -30,6 +30,10 @@ import (
 	"github.com/containerd/nerdctl/pkg/ocihook"
 )
 
+type cniNetworkManagerPlatform struct {
+	netNs *netns.NetNS
+}
+
 // Verifies that the internal network settings are correct.
 func (m *cniNetworkManager) VerifyNetworkOptions(_ context.Context) error {
 	e, err := netutil.NewCNIEnv(m.globalOptions.CNIPath, m.globalOptions.CNINetConfPath, netutil.WithDefaultNetwork())