opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3121 from giuseppe/rootless-error-cni

Browse Source 
network: raise a clearer error when using CNI
This commit is contained in:
OpenShift Merge Robot
2019-05-16 16:24:06 +02:00
committed by GitHub
parent 2bb1487a00 04aa0d65b0
commit bd21a99501
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/networking_linux.go
View File

@ -19,6 +19,7 @@ import (
"github.com/containers/libpod/pkg/firewall" "github.com/containers/libpod/pkg/firewall"
"github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/inspect"
"github.com/containers/libpod/pkg/netns" "github.com/containers/libpod/pkg/netns"
"github.com/containers/libpod/pkg/rootless"
"github.com/cri-o/ocicni/pkg/ocicni" "github.com/cri-o/ocicni/pkg/ocicni"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -100,6 +101,9 @@ func (r *Runtime) configureNetNS(ctr *Container, ctrNS ns.NetNS) ([]*cnitypes.Re
// Create and configure a new network namespace for a container // Create and configure a new network namespace for a container
func (r *Runtime) createNetNS(ctr *Container) (n ns.NetNS, q []*cnitypes.Result, err error) { func (r *Runtime) createNetNS(ctr *Container) (n ns.NetNS, q []*cnitypes.Result, err error) {
if rootless.IsRootless() {
return nil, nil, errors.New("cannot configure a new network namespace in rootless mode, only --network=slirp4netns is supported")
}
ctrNS, err := netns.NewNS() ctrNS, err := netns.NewNS()
if err != nil { if err != nil {
return nil, nil, errors.Wrapf(err, "error creating network namespace for container %s", ctr.ID()) return nil, nil, errors.Wrapf(err, "error creating network namespace for container %s", ctr.ID())