summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2021-02-18 14:53:53 +0100
committerPaul Holzinger <paul.holzinger@web.de>2021-04-01 17:27:03 +0200
commit00b2ec5e6f8ad332411271df1bdd968493cab2c2 (patch)
tree69485fd451bdb144ce8914af23a746639b21a745 /pkg
parent54b588c07d05858c9bbc523eeff0badb85d53f76 (diff)
downloadpodman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.tar.gz
podman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.tar.bz2
podman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.zip
Add rootless support for cni and --uidmap
This is supported with the new rootless cni logic. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/namespaces.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index b87375a92..845dfdad7 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -236,9 +236,6 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.
case specgen.Private:
fallthrough
case specgen.Bridge:
- if postConfigureNetNS && rootless.IsRootless() {
- return nil, errors.New("CNI networks not supported with user namespaces")
- }
portMappings, err := createPortMappings(ctx, s, img)
if err != nil {
return nil, err