diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 16:58:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 16:58:24 +0200 |
| commit | dcb99f5315eea27f9cc8720937ae2f5c272a6a00 (patch) | |
| tree | e846f513577a5890a1bfbd7ffdf8e25941aa7293 /pkg | |
| parent | 46463e454e7fed9c25c762912a1dc7c3c7421cce (diff) | |
| parent | b1552d9124d3d2f927366a86c31a7902eb60ca64 (diff) | |
| download | podman-dcb99f5315eea27f9cc8720937ae2f5c272a6a00.tar.gz podman-dcb99f5315eea27f9cc8720937ae2f5c272a6a00.tar.bz2 podman-dcb99f5315eea27f9cc8720937ae2f5c272a6a00.zip | |
Merge pull request #5972 from mheon/fix_noinfra
Do not join pod namespaces without an infra ctr
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 2aaeb9513..2e0e088bf 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -26,7 +26,7 @@ func GetDefaultNamespaceMode(nsType string, cfg *config.Config, pod *libpod.Pod) nsType = strings.ToLower(nsType) // If the pod is not nil - check shared namespaces - if pod != nil { + if pod != nil && pod.HasInfraContainer() { podMode := false switch { case nsType == "pid" && pod.SharesPID(): |