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

CRI: remove default /dev/shm mount in Sandbox.

Browse Source 
This's an optimization to get rid of redundant `/dev/shm" mounts for pause container.
In `oci.defaultMounts`, there is a default `/dev/shm` mount which is redundant for
pause container.

Fixes: #6911

Signed-off-by: Jiang Liu <gerry@linux.alibaba.com>
Signed-off-by: Lei Wang  <wllenyj@linux.alibaba.com>
This commit is contained in:
wllenyj 2022-05-10 01:09:32 +08:00
parent a5d7185c72
commit a62a95789c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,8 @@ func (c *criService) sandboxContainerSpec(id string, config *runtime.PodSandboxC
if nsOptions.GetIpc() == runtime.NamespaceMode_NODE { if nsOptions.GetIpc() == runtime.NamespaceMode_NODE {
sandboxDevShm = devShm sandboxDevShm = devShm
} }
// Remove the default /dev/shm mount from defaultMounts, it is added in oci/mounts.go.
specOpts = append(specOpts, oci.WithoutMounts(devShm))
specOpts = append(specOpts, oci.WithMounts([]runtimespec.Mount{ specOpts = append(specOpts, oci.WithMounts([]runtimespec.Mount{
{ {
Source: sandboxDevShm, Source: sandboxDevShm,