Merge pull request #1112 from Random-Liu/cherrypick-#1102-release-1.0

Random-Liu · web-flow · commit b9c06fd1410f · 2019-04-01T11:28:33.000-07:00
Cherrypick #1102 release 1.0
diff --git a/integration/pod_hostname_test.go b/integration/pod_hostname_test.go
@@ -34,6 +34,7 @@ func TestPodHostname(t *testing.T) {
 	for name, test := range map[string]struct {
 		opts             []PodSandboxOpts
 		expectedHostname string
+		expectErr        bool
 	}{
 		"regular pod with custom hostname": {
 			opts: []PodSandboxOpts{
@@ -47,12 +48,12 @@ func TestPodHostname(t *testing.T) {
 			},
 			expectedHostname: hostname,
 		},
-		"host network pod with custom hostname": {
+		"host network pod with custom hostname should fail": {
 			opts: []PodSandboxOpts{
 				WithHostNetwork,
 				WithPodHostname("test-hostname"),
 			},
-			expectedHostname: "test-hostname",
+			expectErr: true,
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
@@ -64,11 +65,21 @@ func TestPodHostname(t *testing.T) {
 			t.Log("Create a sandbox with hostname")
 			sbConfig := PodSandboxConfig("sandbox", "hostname", opts...)
 			sb, err := runtimeService.RunPodSandbox(sbConfig)
-			require.NoError(t, err)
-			defer func() {
-				assert.NoError(t, runtimeService.StopPodSandbox(sb))
-				assert.NoError(t, runtimeService.RemovePodSandbox(sb))
-			}()
+			if err != nil {
+				if !test.expectErr {
+					t.Fatalf("Unexpected RunPodSandbox error: %v", err)
+				}
+				return
+			} else {
+				// Make sure the sandbox is cleaned up.
+				defer func() {
+					assert.NoError(t, runtimeService.StopPodSandbox(sb))
+					assert.NoError(t, runtimeService.RemovePodSandbox(sb))
+				}()
+				if test.expectErr {
+					t.Fatalf("Expected RunPodSandbox to return error")
+				}
+			}
 
 			const (
 				testImage     = "busybox"
diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go
@@ -384,6 +384,7 @@ func (c *criService) generateSandboxContainerSpec(id string, config *runtime.Pod
 	nsOptions := securityContext.GetNamespaceOptions()
 	if nsOptions.GetNetwork() == runtime.NamespaceMode_NODE {
 		g.RemoveLinuxNamespace(string(runtimespec.NetworkNamespace)) // nolint: errcheck
+		g.RemoveLinuxNamespace(string(runtimespec.UTSNamespace))     // nolint: errcheck
 	} else {
 		//TODO(Abhi): May be move this to containerd spec opts (WithLinuxSpaceOption)
 		g.AddOrReplaceLinuxNamespace(string(runtimespec.NetworkNamespace), nsPath) // nolint: errcheck
diff --git a/pkg/server/sandbox_run_test.go b/pkg/server/sandbox_run_test.go
@@ -95,6 +95,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,
 				})
@@ -119,6 +122,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,
 				})
