mirror of
https://github.com/containers/podman
synced 2024-10-21 17:53:44 +00:00
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>
This commit is contained in:
parent
54b588c07d
commit
00b2ec5e6f
|
@ -966,9 +966,7 @@ func (c *Container) completeNetworkSetup() error {
|
|||
if err := c.syncContainer(); err != nil {
|
||||
return err
|
||||
}
|
||||
if rootless.IsRootless() {
|
||||
return c.runtime.setupRootlessNetNS(c)
|
||||
} else if c.config.NetMode.IsSlirp4netns() {
|
||||
if c.config.NetMode.IsSlirp4netns() {
|
||||
return c.runtime.setupSlirp4netns(c)
|
||||
}
|
||||
if err := c.runtime.setupNetNS(c); err != nil {
|
||||
|
|
|
@ -972,8 +972,11 @@ func (r *Runtime) setupNetNS(ctr *Container) error {
|
|||
if _, err := rand.Reader.Read(b); err != nil {
|
||||
return errors.Wrapf(err, "failed to generate random netns name")
|
||||
}
|
||||
|
||||
nsPath := fmt.Sprintf("/run/netns/cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
|
||||
nsPath, err := netns.GetNSRunDir()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
nsPath = filepath.Join(nsPath, fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]))
|
||||
|
||||
if err := os.MkdirAll(filepath.Dir(nsPath), 0711); err != nil {
|
||||
return err
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -641,22 +641,26 @@ var _ = Describe("Podman run networking", func() {
|
|||
Expect(run.OutputToString()).To(ContainSubstring(ipAddr))
|
||||
})
|
||||
|
||||
It("podman rootless fails custom CNI network with --uidmap", func() {
|
||||
SkipIfNotRootless("The configuration works with rootless")
|
||||
|
||||
It("podman cni network works across user ns", func() {
|
||||
netName := stringid.GenerateNonCryptoID()
|
||||
create := podmanTest.Podman([]string{"network", "create", netName})
|
||||
create.WaitWithDefaultTimeout()
|
||||
Expect(create.ExitCode()).To(BeZero())
|
||||
defer podmanTest.removeCNINetwork(netName)
|
||||
|
||||
run := podmanTest.Podman([]string{"run", "--rm", "--net", netName, "--uidmap", "0:1:4096", ALPINE, "true"})
|
||||
name := "nc-server"
|
||||
run := podmanTest.Podman([]string{"run", "-d", "--name", name, "--net", netName, ALPINE, "nc", "-l", "-p", "8080"})
|
||||
run.WaitWithDefaultTimeout()
|
||||
Expect(run.ExitCode()).To(Equal(125))
|
||||
Expect(run.ExitCode()).To(Equal(0))
|
||||
|
||||
remove := podmanTest.Podman([]string{"network", "rm", netName})
|
||||
remove.WaitWithDefaultTimeout()
|
||||
Expect(remove.ExitCode()).To(BeZero())
|
||||
run = podmanTest.Podman([]string{"run", "--rm", "--net", netName, "--uidmap", "0:1:4096", ALPINE, "sh", "-c", fmt.Sprintf("echo podman | nc -w 1 %s.dns.podman 8080", name)})
|
||||
run.WaitWithDefaultTimeout()
|
||||
Expect(run.ExitCode()).To(Equal(0))
|
||||
|
||||
log := podmanTest.Podman([]string{"logs", name})
|
||||
log.WaitWithDefaultTimeout()
|
||||
Expect(log.ExitCode()).To(Equal(0))
|
||||
Expect(log.OutputToString()).To(Equal("podman"))
|
||||
})
|
||||
|
||||
It("podman run with new:pod and static-ip", func() {
|
||||
|
|
Loading…
Reference in a new issue