summaryrefslogtreecommitdiff
path: root/pkg/specgen/pod_validate.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-05-07 15:43:51 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-05-07 17:58:50 -0400
commit2d68dc776d80cc5b71c609b8ddaf2069c97193e7 (patch)
tree2de91bd3d68b3d80d0433a24629b88c83061e50c /pkg/specgen/pod_validate.go
parentab518cdba02b85a32d3c2bce4c0b65dcdea4dfcc (diff)
downloadpodman-2d68dc776d80cc5b71c609b8ddaf2069c97193e7.tar.gz
podman-2d68dc776d80cc5b71c609b8ddaf2069c97193e7.tar.bz2
podman-2d68dc776d80cc5b71c609b8ddaf2069c97193e7.zip
Fix parsing of --network for `podman pod create`
Interpreting CNI networks was a bit broken, and it was causing rootless `podman pod create` to fail. Also, we were missing the `--net` alias for `--network`, so add that. Fixes #6119 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/specgen/pod_validate.go')
-rw-r--r--pkg/specgen/pod_validate.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go
index 98d59549e..08f1c0300 100644
--- a/pkg/specgen/pod_validate.go
+++ b/pkg/specgen/pod_validate.go
@@ -33,7 +33,7 @@ func (p *PodSpecGenerator) Validate() error {
}
// PodNetworkConfig
- if err := p.NetNS.validate(); err != nil {
+ if err := validateNetNS(&p.NetNS); err != nil {
return err
}
if p.NoInfra {
@@ -85,10 +85,6 @@ func (p *PodSpecGenerator) Validate() error {
return exclusivePodOptions("NoManageHosts", "HostAdd")
}
- if err := p.NetNS.validate(); err != nil {
- return err
- }
-
// Set Defaults
if p.NetNS.Value == "" {
if rootless.IsRootless() {