summaryrefslogtreecommitdiff
path: root/cmd/podman/common/netflags.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-04-20 15:32:46 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-04-21 14:38:52 -0400
commit1cd2b746d0d6a4e8c074bc444b4a4a2afef30d5d (patch)
tree81833e3654a63e042f7d77b854740003fa0d8b4a /cmd/podman/common/netflags.go
parent2ed4a0e35f6182b79976979ecf3f3ab9010417bd (diff)
downloadpodman-1cd2b746d0d6a4e8c074bc444b4a4a2afef30d5d.tar.gz
podman-1cd2b746d0d6a4e8c074bc444b4a4a2afef30d5d.tar.bz2
podman-1cd2b746d0d6a4e8c074bc444b4a4a2afef30d5d.zip
Modify namespace generation code for specgen
Namespaces have now been changed to properly handle all cases. Spec handling code for namespaces was consolidated in a single function. Still missing: - Image ports - Pod namespaces likely still broken in Podmanv2 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/common/netflags.go')
-rw-r--r--cmd/podman/common/netflags.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go
index 1a47733e7..a439eb792 100644
--- a/cmd/podman/common/netflags.go
+++ b/cmd/podman/common/netflags.go
@@ -5,6 +5,7 @@ import (
"github.com/containers/libpod/cmd/podman/parse"
"github.com/containers/libpod/pkg/domain/entities"
+ "github.com/containers/libpod/pkg/specgen"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
@@ -159,9 +160,13 @@ func NetFlagsToNetOptions(cmd *cobra.Command) (*entities.NetOptions, error) {
return nil, err
}
- return nil, errors.Errorf("network %s is not yet supported", network)
- // TODO How do I convert a string network to a Specgen.Namespace?
- // opts.Network = specgen.Namespace{NSMode: network}
+ ns, cniNets, err := specgen.ParseNetworkNamespace(network)
+ if err != nil {
+ return nil, err
+ }
+
+ opts.Network = ns
+ opts.CNINetworks = cniNets
}
return &opts, err