From 97323808ed57cf52311a80c55339f8927614b7f0 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Mon, 17 Feb 2020 16:49:59 -0500
Subject: Add network options to podman pod create

Enables most of the network-related functionality from
`podman run` in `podman pod create`. Custom CNI networks can be
specified, host networking is supported, DNS options can be
configured.

Also enables host networking in `podman play kube`.

Fixes #2808
Fixes #3837
Fixes #4432
Fixes #4718
Fixes #4770

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 libpod/runtime_pod_infra_linux.go | 80 +++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

(limited to 'libpod/runtime_pod_infra_linux.go')

diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 3aded61f2..a6cac2b72 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -37,6 +37,7 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
 	isRootless := rootless.IsRootless()
 
 	entryCmd := []string{r.config.InfraCommand}
+	var options []CtrCreateOption
 	// I've seen circumstances where config is being passed as nil.
 	// Let's err on the side of safety and make sure it's safe to use.
 	if config != nil {
@@ -68,6 +69,44 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
 				g.AddProcessEnv(nameValSlice[0], nameValSlice[1])
 			}
 		}
+
+		// Since user namespace sharing is not implemented, we only need to check if it's rootless
+		if !p.config.InfraContainer.HostNetwork {
+			netmode := "bridge"
+			if isRootless {
+				netmode = "slirp4netns"
+			}
+			// PostConfigureNetNS should not be set since user namespace sharing is not implemented
+			// and rootless networking no longer supports post configuration setup
+			options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, false, netmode, p.config.InfraContainer.Networks))
+		} else if err := g.RemoveLinuxNamespace(string(spec.NetworkNamespace)); err != nil {
+			return nil, errors.Wrapf(err, "error removing network namespace from pod %s infra container", p.ID())
+		}
+
+		if p.config.InfraContainer.StaticIP != nil {
+			options = append(options, WithStaticIP(p.config.InfraContainer.StaticIP))
+		}
+		if p.config.InfraContainer.StaticMAC != nil {
+			options = append(options, WithStaticMAC(p.config.InfraContainer.StaticMAC))
+		}
+		if p.config.InfraContainer.UseImageResolvConf {
+			options = append(options, WithUseImageResolvConf())
+		}
+		if len(p.config.InfraContainer.DNSServer) > 0 {
+			options = append(options, WithDNS(p.config.InfraContainer.DNSServer))
+		}
+		if len(p.config.InfraContainer.DNSSearch) > 0 {
+			options = append(options, WithDNSSearch(p.config.InfraContainer.DNSSearch))
+		}
+		if len(p.config.InfraContainer.DNSOption) > 0 {
+			options = append(options, WithDNSOption(p.config.InfraContainer.DNSOption))
+		}
+		if p.config.InfraContainer.UseImageHosts {
+			options = append(options, WithUseImageHosts())
+		}
+		if len(p.config.InfraContainer.HostAdd) > 0 {
+			options = append(options, WithHosts(p.config.InfraContainer.HostAdd))
+		}
 	}
 
 	g.SetRootReadonly(true)
@@ -87,52 +126,11 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
 	}
 
 	containerName := p.ID()[:IDTruncLength] + "-infra"
-	var options []CtrCreateOption
 	options = append(options, r.WithPod(p))
 	options = append(options, WithRootFSFromImage(imgID, imgName, false))
 	options = append(options, WithName(containerName))
 	options = append(options, withIsInfra())
 
-	// Since user namespace sharing is not implemented, we only need to check if it's rootless
-	if !p.config.InfraContainer.HostNetwork {
-		netmode := "bridge"
-		if isRootless {
-			netmode = "slirp4netns"
-		}
-		// PostConfigureNetNS should not be set since user namespace sharing is not implemented
-		// and rootless networking no longer supports post configuration setup
-		options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, false, netmode, p.config.InfraContainer.Networks))
-	} else {
-		if err := g.RemoveLinuxNamespace(string(spec.NetworkNamespace)); err != nil {
-			return nil, errors.Wrapf(err, "error removing network namespace from pod %s infra container", p.ID())
-		}
-	}
-
-	if p.config.InfraContainer.StaticIP != nil {
-		options = append(options, WithStaticIP(p.config.InfraContainer.StaticIP))
-	}
-	if p.config.InfraContainer.StaticMAC != nil {
-		options = append(options, WithStaticMAC(p.config.InfraContainer.StaticMAC))
-	}
-	if p.config.InfraContainer.UseImageResolvConf {
-		options = append(options, WithUseImageResolvConf())
-	}
-	if len(p.config.InfraContainer.DNSServer) > 0 {
-		options = append(options, WithDNS(p.config.InfraContainer.DNSServer))
-	}
-	if len(p.config.InfraContainer.DNSSearch) > 0 {
-		options = append(options, WithDNSSearch(p.config.InfraContainer.DNSSearch))
-	}
-	if len(p.config.InfraContainer.DNSOption) > 0 {
-		options = append(options, WithDNSOption(p.config.InfraContainer.DNSOption))
-	}
-	if p.config.InfraContainer.UseImageHosts {
-		options = append(options, WithUseImageHosts())
-	}
-	if len(p.config.InfraContainer.HostAdd) > 0 {
-		options = append(options, WithHosts(p.config.InfraContainer.HostAdd))
-	}
-
 	return r.newContainer(ctx, g.Config, options...)
 }
 
-- 
cgit v1.2.3-54-g00ecf