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

No UTS namespace for hostnetwork.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-03-27 15:05:05 -07:00
parent 8777224600
commit 9bd49c98c6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/server/sandbox_run.go
View File

@ -385,6 +385,7 @@ func (c *criService) generateSandboxContainerSpec(id string, config *runtime.Pod
) )
if nsOptions.GetNetwork() == runtime.NamespaceMode_NODE { if nsOptions.GetNetwork() == runtime.NamespaceMode_NODE {
specOpts = append(specOpts, customopts.WithoutNamespace(runtimespec.NetworkNamespace)) specOpts = append(specOpts, customopts.WithoutNamespace(runtimespec.NetworkNamespace))
specOpts = append(specOpts, customopts.WithoutNamespace(runtimespec.UTSNamespace))
} else { } else {
//TODO(Abhi): May be move this to containerd spec opts (WithLinuxSpaceOption) //TODO(Abhi): May be move this to containerd spec opts (WithLinuxSpaceOption)
specOpts = append(specOpts, oci.WithLinuxNamespace( specOpts = append(specOpts, oci.WithLinuxNamespace(

6
pkg/server/sandbox_run_test.go
View File

@ -101,6 +101,9 @@ func TestGenerateSandboxContainerSpec(t *testing.T) {
Type: runtimespec.NetworkNamespace, Type: runtimespec.NetworkNamespace,
Path: nsPath, Path: nsPath,
}) })
assert.Contains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{
Type: runtimespec.UTSNamespace,
})
assert.Contains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ assert.Contains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{
Type: runtimespec.PIDNamespace, Type: runtimespec.PIDNamespace,
}) })
@ -125,6 +128,9 @@ func TestGenerateSandboxContainerSpec(t *testing.T) {
assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{
Type: runtimespec.NetworkNamespace, Type: runtimespec.NetworkNamespace,
}) })
assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{
Type: runtimespec.UTSNamespace,
})
assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{
Type: runtimespec.PIDNamespace, Type: runtimespec.PIDNamespace,
}) })