diff options
| author | cdoern <cdoern@redhat.com> | 2022-06-03 11:01:22 -0400 |
|---|---|---|
| committer | cdoern <cdoern@redhat.com> | 2022-06-09 10:30:48 -0400 |
| commit | b13fc1bf983860d0627155ddbbbf28bf09e29a9e (patch) | |
| tree | b527f316d0a1cca506a3a6cbc6e508705aa40ea6 /libpod/pod_api.go | |
| parent | 0dda4681927b3428a113c81d851d962da8dd7302 (diff) | |
| download | podman-b13fc1bf983860d0627155ddbbbf28bf09e29a9e.tar.gz podman-b13fc1bf983860d0627155ddbbbf28bf09e29a9e.tar.bz2 podman-b13fc1bf983860d0627155ddbbbf28bf09e29a9e.zip | |
patch for pod host networking & other host namespace handling
this patch included additonal host namespace checks when creating a ctr as well
as fixing of the tests to check /proc/self/ns/net
see #14461
Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 1c1e15984..fefe0e329 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -9,6 +9,7 @@ import ( "github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/pkg/parallel" "github.com/containers/podman/v4/pkg/rootless" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -673,8 +674,8 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { infraConfig.CPUPeriod = p.CPUPeriod() infraConfig.CPUQuota = p.CPUQuota() infraConfig.CPUSetCPUs = p.ResourceLim().CPU.Cpus - infraConfig.PidNS = p.PidMode() - infraConfig.UserNS = p.UserNSMode() + infraConfig.PidNS = p.NamespaceMode(specs.PIDNamespace) + infraConfig.UserNS = p.NamespaceMode(specs.UserNamespace) namedVolumes, mounts := infra.SortUserVolumes(infra.config.Spec) inspectMounts, err = infra.GetMounts(namedVolumes, infra.config.ImageVolumes, mounts) infraSecurity = infra.GetSecurityOptions() |