diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 16:35:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 16:35:33 +0200 |
| commit | d3826d6eb3ec38116ee40b5081dcddab39bd3493 (patch) | |
| tree | b469f7f41c6b84327f64ec7ff5a1dc8a171388d0 /pkg/specgen/podspecgen.go | |
| parent | f4e3ec5fd69a6cc831b63619c5772dbf5c6a11a6 (diff) | |
| parent | 2d68dc776d80cc5b71c609b8ddaf2069c97193e7 (diff) | |
| download | podman-d3826d6eb3ec38116ee40b5081dcddab39bd3493.tar.gz podman-d3826d6eb3ec38116ee40b5081dcddab39bd3493.tar.bz2 podman-d3826d6eb3ec38116ee40b5081dcddab39bd3493.zip | |
Merge pull request #6124 from mheon/fix_rootless_podcreate
Fix parsing of --network for `podman pod create`
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"` |