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

Merge pull request #7577 from dcantah/maintenance-cri-winns

Browse Source
This commit is contained in:
Maksym Pavlenko
2022-10-23 14:32:02 -07:00
committed by GitHub
parent 52025b5d67 9a0331c477
commit 908be16858
5 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.
// NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(netNSPath),
oci.WithWindowsNetworkNamespace(netNSPath),
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.
// NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(nsPath),
oci.WithWindowsNetworkNamespace(nsPath),
)
specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares)