Merge pull request #5064 from mheon/pod_network_opts

Add backend code for pod network options

1 files changed, 26 insertions, 2 deletions

diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 6a27c2800..1b1421ca8 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -94,14 +94,38 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
 	options = append(options, withIsInfra())
 
 	// Since user namespace sharing is not implemented, we only need to check if it's rootless
-	networks := make([]string, 0)
 	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, networks))
+	options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, false, netmode, p.config.InfraContainer.Networks))
+
+	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...)
 }