diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-01 08:48:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 08:48:54 -0500 |
commit | 20183349fd2c6a9a569c6c79234af48bb5d92ff7 (patch) | |
tree | 29beae2f47e790513f0a3e9ebc1501c45ec7cb06 /cmd/podman | |
parent | 81a3ba36ae8d22b767e620c0b4c804764340de52 (diff) | |
parent | 3cfd4ce45e4967d395172527e4b4f589ec8d6fd6 (diff) | |
download | podman-20183349fd2c6a9a569c6c79234af48bb5d92ff7.tar.gz podman-20183349fd2c6a9a569c6c79234af48bb5d92ff7.tar.bz2 podman-20183349fd2c6a9a569c6c79234af48bb5d92ff7.zip |
Merge pull request #9168 from Luap99/fix-pod-create-network-parsing
Fix --network parsing for podman pod create
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/pods/create.go | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index d997ea344..23fb323a0 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -171,33 +171,6 @@ func create(cmd *cobra.Command, args []string) error { if err != nil { return err } - createOptions.Net.Network = specgen.Namespace{} - if cmd.Flag("network").Changed { - netInput, err := cmd.Flags().GetString("network") - if err != nil { - return err - } - parts := strings.SplitN(netInput, ":", 2) - - n := specgen.Namespace{} - switch { - case netInput == "bridge": - n.NSMode = specgen.Bridge - case netInput == "host": - n.NSMode = specgen.Host - case netInput == "slirp4netns", strings.HasPrefix(netInput, "slirp4netns:"): - n.NSMode = specgen.Slirp - if len(parts) > 1 { - createOptions.Net.NetworkOptions = make(map[string][]string) - createOptions.Net.NetworkOptions[parts[0]] = strings.Split(parts[1], ",") - } - default: - // Container and NS mode are presently unsupported - n.NSMode = specgen.Bridge - createOptions.Net.CNINetworks = strings.Split(netInput, ",") - } - createOptions.Net.Network = n - } if len(createOptions.Net.PublishPorts) > 0 { if !createOptions.Infra { return errors.Errorf("you must have an infra container to publish port bindings to the host") |