diff options
| author | cdoern <cdoern@redhat.com> | 2022-01-18 15:46:11 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-02-10 13:49:46 -0500 |
| commit | b1bf91a22a8d5d4d676e48efa2073944baff14c1 (patch) | |
| tree | 66bac7f10ddc1d85c847573c1ad46c382b8c00dd /pkg/specgen/generate/pod_create.go | |
| parent | 85c0fe7dc086f89f958302b7fd0f5fe8103db441 (diff) | |
| download | podman-b1bf91a22a8d5d4d676e48efa2073944baff14c1.tar.gz podman-b1bf91a22a8d5d4d676e48efa2073944baff14c1.tar.bz2 podman-b1bf91a22a8d5d4d676e48efa2073944baff14c1.zip | |
Podman pod create --share-parent vs --share=cgroup
separated cgroupNS sharing from setting the pod as the cgroup parent,
made a new flag --share-parent which sets the pod as the cgroup parent for all
containers entering the pod
remove cgroup from the default kernel namespaces since we want the same default behavior as before which is just the cgroup parent.
resolves #12765
Signed-off-by: cdoern <cdoern@redhat.com>
Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'pkg/specgen/generate/pod_create.go')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 03829e8cf..68fda3ad7 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -166,6 +166,9 @@ func createPodOptions(p *specgen.PodSpecGenerator, rt *libpod.Runtime, infraSpec ) if !p.NoInfra { //&& infraSpec != nil { options = append(options, libpod.WithInfraContainer()) + if p.ShareParent == nil || (p.ShareParent != nil && *p.ShareParent) { + options = append(options, libpod.WithPodParent()) + } nsOptions, err := GetNamespaceOptions(p.SharedNamespaces, p.InfraContainerSpec.NetNS.IsHost()) if err != nil { return nil, err |