diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 15:37:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 15:37:58 +0200 |
| commit | 529824ec1e02e9b7ea893bbab35179ef16d4661d (patch) | |
| tree | 6c2e14c482b3f67013569b66616119f8d8cc2031 /pkg/specgen/pod_validate.go | |
| parent | 7cb46450fd9cc2a9fc545004431c1d416970e0ed (diff) | |
| parent | 2fc54facf2f816047e2243547eb26fa9a897d7be (diff) | |
| download | podman-529824ec1e02e9b7ea893bbab35179ef16d4661d.tar.gz podman-529824ec1e02e9b7ea893bbab35179ef16d4661d.tar.bz2 podman-529824ec1e02e9b7ea893bbab35179ef16d4661d.zip | |
Merge pull request #5997 from giuseppe/fix-pod-create
v2, podman: fix a bunch of "podman pod *" tests
Diffstat (limited to 'pkg/specgen/pod_validate.go')
| -rw-r--r-- | pkg/specgen/pod_validate.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index f2f90e58d..98d59549e 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -62,7 +62,7 @@ func (p *PodSpecGenerator) Validate() error { return exclusivePodOptions("NoInfra", "NoManageResolvConf") } } - if p.NetNS.NSMode != Bridge { + if p.NetNS.NSMode != "" && p.NetNS.NSMode != Bridge && p.NetNS.NSMode != Default { if len(p.PortMappings) > 0 { return errors.New("PortMappings can only be used with Bridge mode networking") } |