diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-24 18:09:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-24 18:09:43 +0100 |
commit | caaaf07c1e9d30d91122a462e65cea5ca49391d0 (patch) | |
tree | 4071e2b5cb7801c4daabbd7ad1d1f784bf157f9a /pkg/domain/infra | |
parent | 32748492e919b9f3a7882dc2febc454d39c04c3e (diff) | |
parent | b469bf5c05ce05e7b77852fa686f1e26dd59ec3e (diff) | |
download | podman-caaaf07c1e9d30d91122a462e65cea5ca49391d0.tar.gz podman-caaaf07c1e9d30d91122a462e65cea5ca49391d0.tar.bz2 podman-caaaf07c1e9d30d91122a462e65cea5ca49391d0.zip |
Merge pull request #13587 from giuseppe/clone-to-pod
container: allow clone to an existing pod
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r-- | pkg/domain/infra/abi/containers.go | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 1986228a6..f45bdeba5 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -1496,6 +1496,35 @@ func (ic *ContainerEngine) ContainerClone(ctx context.Context, ctrCloneOpts enti return nil, err } + if ctrCloneOpts.CreateOpts.Pod != "" { + pod, err := ic.Libpod.LookupPod(ctrCloneOpts.CreateOpts.Pod) + if err != nil { + return nil, err + } + + allNamespaces := []struct { + isShared bool + value *specgen.Namespace + }{ + {pod.SharesPID(), &spec.PidNS}, + {pod.SharesNet(), &spec.NetNS}, + {pod.SharesCgroup(), &spec.CgroupNS}, + {pod.SharesIPC(), &spec.IpcNS}, + {pod.SharesUTS(), &spec.UtsNS}, + } + + printWarning := false + for _, n := range allNamespaces { + if n.isShared && !n.value.IsDefault() { + *n.value = specgen.Namespace{NSMode: specgen.Default} + printWarning = true + } + } + if printWarning { + logrus.Warning("At least one namespace was reset to the default configuration") + } + } + err = specgenutil.FillOutSpecGen(spec, &ctrCloneOpts.CreateOpts, []string{}) if err != nil { return nil, err |