diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-05-07 15:43:51 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-05-07 17:58:50 -0400 |
| commit | 2d68dc776d80cc5b71c609b8ddaf2069c97193e7 (patch) | |
| tree | 2de91bd3d68b3d80d0433a24629b88c83061e50c /pkg/specgen/podspecgen.go | |
| parent | ab518cdba02b85a32d3c2bce4c0b65dcdea4dfcc (diff) | |
| download | podman-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/podspecgen.go')
| -rw-r--r-- | pkg/specgen/podspecgen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 682f3f215..11976233a 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -54,7 +54,7 @@ type PodNetworkConfig struct { // namespace. This network will, by default, be shared with all // containers in the pod. // Cannot be set to FromContainer and FromPod. - // Setting this to anything except "" conflicts with NoInfra=true. + // Setting this to anything except default conflicts with NoInfra=true. // Defaults to Bridge as root and Slirp as rootless. // Mandatory. NetNS Namespace `json:"netns,omitempty"` |