github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

maintenance: Remove WithWindowsNetworkNamespace from pkg/cri

Browse Source 
Old TODO stating that pkg/cri/opts's `WithWindowsNetworkNamespace`
should be moved to the main containerd pkg was out of date as thats
already been done (well, to the /oci package). This just removes it
and swaps all uses of `WithWindowsNetworkNamespace` to the oci
packages impl.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2022-10-23 06:45:32 -07:00
parent 72177ca663
commit 9a0331c477
5 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cri/opts/spec_windows.go
View File

@ -32,21 +32,6 @@ import (
osinterface "github.com/containerd/containerd/pkg/os" osinterface "github.com/containerd/containerd/pkg/os"
) )
// WithWindowsNetworkNamespace sets windows network namespace for container.
// TODO(windows): Move this into container/containerd.
func WithWindowsNetworkNamespace(path string) oci.SpecOpts {
return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) error {
if s.Windows == nil {
s.Windows = &runtimespec.Windows{}
}
if s.Windows.Network == nil {
s.Windows.Network = &runtimespec.WindowsNetwork{}
}
s.Windows.Network.NetworkNamespace = path
return nil
}
}
// namedPipePath returns true if the given path is to a named pipe. // namedPipePath returns true if the given path is to a named pipe.
func namedPipePath(p string) bool { func namedPipePath(p string) bool {
return strings.HasPrefix(p, `\\.\pipe\`) return strings.HasPrefix(p, `\\.\pipe\`)

2
pkg/cri/sbserver/container_create_windows.go
View File

@ -85,7 +85,7 @@ func (c *criService) containerSpec(
// Clear the root location since hcsshim expects it. // Clear the root location since hcsshim expects it.
// NOTE: readonly rootfs doesn't work on windows. // NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot, customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(netNSPath), oci.WithWindowsNetworkNamespace(netNSPath),
oci.WithHostname(sandboxConfig.GetHostname()), oci.WithHostname(sandboxConfig.GetHostname()),
) )

2
pkg/cri/sbserver/podsandbox/sandbox_run_windows.go
View File

@ -51,7 +51,7 @@ func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxC
// Clear the root location since hcsshim expects it. // Clear the root location since hcsshim expects it.
// NOTE: readonly rootfs doesn't work on windows. // NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot, customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(nsPath), oci.WithWindowsNetworkNamespace(nsPath),
) )
specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares) specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares)

2
pkg/cri/server/container_create_windows.go
View File

@ -85,7 +85,7 @@ func (c *criService) containerSpec(
// Clear the root location since hcsshim expects it. // Clear the root location since hcsshim expects it.
// NOTE: readonly rootfs doesn't work on windows. // NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot, customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(netNSPath), oci.WithWindowsNetworkNamespace(netNSPath),
oci.WithHostname(sandboxConfig.GetHostname()), oci.WithHostname(sandboxConfig.GetHostname()),
) )

2
pkg/cri/server/sandbox_run_windows.go
View File

@ -51,7 +51,7 @@ func (c *criService) sandboxContainerSpec(id string, config *runtime.PodSandboxC
// Clear the root location since hcsshim expects it. // Clear the root location since hcsshim expects it.
// NOTE: readonly rootfs doesn't work on windows. // NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot, customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(nsPath), oci.WithWindowsNetworkNamespace(nsPath),
) )
specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares) specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares)