diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-28 13:53:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-28 13:53:22 -0400 |
| commit | 8c2d6b86644f252fb9d145a4eb6bf2b9d723e010 (patch) | |
| tree | 5184d3e4bfaa0fcc8870e56b615bb5c0e447be75 /libpod | |
| parent | f722879d3b9ad038f2bf84017c8343f19806a11e (diff) | |
| parent | 7f28fd938607df64e8844f3125838fc659753843 (diff) | |
| download | podman-8c2d6b86644f252fb9d145a4eb6bf2b9d723e010.tar.gz podman-8c2d6b86644f252fb9d145a4eb6bf2b9d723e010.tar.bz2 podman-8c2d6b86644f252fb9d145a4eb6bf2b9d723e010.zip | |
Merge pull request #14039 from rhatdan/hosts
Report properly whether pod shares host network
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/pod.go | 9 | ||||
| -rw-r--r-- | libpod/pod_api.go | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libpod/pod.go b/libpod/pod.go index ed2d97b37..6cfe76a18 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -159,6 +159,15 @@ func (p *Pod) CPUQuota() int64 { return 0 } +// NetworkMode returns the Network mode given by the user ex: pod, private... +func (p *Pod) NetworkMode() string { + infra, err := p.runtime.GetContainer(p.state.InfraContainerID) + if err != nil { + return "" + } + return infra.NetworkMode() +} + // PidMode returns the PID mode given by the user ex: pod, private... func (p *Pod) PidMode() string { infra, err := p.runtime.GetContainer(p.state.InfraContainerID) diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 48049798b..ba30d878e 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -593,7 +593,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { return nil, err } infraConfig = new(define.InspectPodInfraConfig) - infraConfig.HostNetwork = !infra.config.ContainerNetworkConfig.UseImageHosts + infraConfig.HostNetwork = p.NetworkMode() == "host" infraConfig.StaticIP = infra.config.ContainerNetworkConfig.StaticIP infraConfig.NoManageResolvConf = infra.config.UseImageResolvConf infraConfig.NoManageHosts = infra.config.UseImageHosts |