Merge pull request #14461 from cdoern/infra

fix pod network handling with a host network
containers · Jun 3, 2022 · 6edbf3b · 6edbf3b
2 parents 232f2c9 + 831d653
commit 6edbf3b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
@@ -42,6 +42,9 @@ func GetDefaultNamespaceMode(nsType string, cfg *config.Config, pod *libpod.Pod)
 			podMode = true
 		case nsType == "net" && pod.SharesNet():
 			podMode = true
+		case nsType == "net" && pod.NetworkMode() == "host":
+			toReturn.NSMode = specgen.Host
+			return toReturn, nil
 		case nsType == "cgroup" && pod.SharesCgroup():
 			podMode = true
 		}

diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
@@ -125,6 +125,19 @@ var _ = Describe("Podman pod create", func() {
 		session = podmanTest.Podman([]string{"run", fedoraMinimal, "curl", "-f", "localhost"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).To(ExitWithError())
+
+		session = podmanTest.Podman([]string{"pod", "create", "--network", "host"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+
+		session = podmanTest.Podman([]string{"run", "-dt", "--pod", session.OutputToString(), ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+
+		session = podmanTest.Podman([]string{"inspect", "--format", "'{{.NetworkSettings.SandboxKey}}'", session.OutputToString()})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+		Expect(session.OutputToString()).Should(ContainSubstring("''")) // no network path... host
 	})
 
 	It("podman pod correctly sets up IPCNS", func() {