From 9bd49c98c6d010c6466efa7213205b1253484508 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Wed, 27 Mar 2019 15:05:05 -0700 Subject: [PATCH] No UTS namespace for hostnetwork. Signed-off-by: Lantao Liu --- pkg/server/sandbox_run.go | 1 + pkg/server/sandbox_run_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 660d09bab..aaddfd1db 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -385,6 +385,7 @@ func (c *criService) generateSandboxContainerSpec(id string, config *runtime.Pod ) if nsOptions.GetNetwork() == runtime.NamespaceMode_NODE { specOpts = append(specOpts, customopts.WithoutNamespace(runtimespec.NetworkNamespace)) + specOpts = append(specOpts, customopts.WithoutNamespace(runtimespec.UTSNamespace)) } else { //TODO(Abhi): May be move this to containerd spec opts (WithLinuxSpaceOption) specOpts = append(specOpts, oci.WithLinuxNamespace( diff --git a/pkg/server/sandbox_run_test.go b/pkg/server/sandbox_run_test.go index 1c8a497a7..244a94a1c 100644 --- a/pkg/server/sandbox_run_test.go +++ b/pkg/server/sandbox_run_test.go @@ -101,6 +101,9 @@ func TestGenerateSandboxContainerSpec(t *testing.T) { Type: runtimespec.NetworkNamespace, Path: nsPath, }) + assert.Contains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ + Type: runtimespec.UTSNamespace, + }) assert.Contains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ Type: runtimespec.PIDNamespace, }) @@ -125,6 +128,9 @@ func TestGenerateSandboxContainerSpec(t *testing.T) { assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ Type: runtimespec.NetworkNamespace, }) + assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ + Type: runtimespec.UTSNamespace, + }) assert.NotContains(t, spec.Linux.Namespaces, runtimespec.LinuxNamespace{ Type: runtimespec.PIDNamespace, })