opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14461 from cdoern/infra

Browse Source 
fix pod network handling with a host network
This commit is contained in:
OpenShift Merge Robot
2022-06-02 21:28:26 -04:00
committed by GitHub
parent 232f2c9eb8 831d6534fb
commit 6edbf3baaa
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/specgen/generate/namespaces.go
View File

@ -42,6 +42,9 @@ func GetDefaultNamespaceMode(nsType string, cfg *config.Config, pod *libpod.Pod)
podMode = true podMode = true
case nsType == "net" && pod.SharesNet(): case nsType == "net" && pod.SharesNet():
podMode = true podMode = true
case nsType == "net" && pod.NetworkMode() == "host":
toReturn.NSMode = specgen.Host
return toReturn, nil
case nsType == "cgroup" && pod.SharesCgroup(): case nsType == "cgroup" && pod.SharesCgroup():
podMode = true podMode = true
} }

13
test/e2e/pod_infra_container_test.go
View File

@ -125,6 +125,19 @@ var _ = Describe("Podman pod create", func() {
session = podmanTest.Podman([]string{"run", fedoraMinimal, "curl", "-f", "localhost"}) session = podmanTest.Podman([]string{"run", fedoraMinimal, "curl", "-f", "localhost"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError()) 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() { It("podman pod correctly sets up IPCNS", func() {