Merge pull request #5997 from giuseppe/fix-pod-create

v2, podman: fix a bunch of "podman pod *" tests

2 files changed, 8 insertions, 1 deletions

diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go
index 292f9b155..babfba9bc 100644
--- a/pkg/specgen/generate/pod_create.go
+++ b/pkg/specgen/generate/pod_create.go
@@ -46,6 +46,13 @@ func createPodOptions(p *specgen.PodSpecGenerator) ([]libpod.PodCreateOption, er
 	if len(p.HostAdd) > 0 {
 		options = append(options, libpod.WithPodHosts(p.HostAdd))
 	}
+	if len(p.DNSServer) > 0 {
+		var dnsServers []string
+		for _, d := range p.DNSServer {
+			dnsServers = append(dnsServers, d.String())
+		}
+		options = append(options, libpod.WithPodDNS(dnsServers))
+	}
 	if len(p.DNSOption) > 0 {
 		options = append(options, libpod.WithPodDNSOption(p.DNSOption))
 	}
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go
index f2f90e58d..98d59549e 100644
--- a/pkg/specgen/pod_validate.go
+++ b/pkg/specgen/pod_validate.go
@@ -62,7 +62,7 @@ func (p *PodSpecGenerator) Validate() error {
 			return exclusivePodOptions("NoInfra", "NoManageResolvConf")
 		}
 	}
-	if p.NetNS.NSMode != Bridge {
+	if p.NetNS.NSMode != "" && p.NetNS.NSMode != Bridge && p.NetNS.NSMode != Default {
 		if len(p.PortMappings) > 0 {
 			return errors.New("PortMappings can only be used with Bridge mode networking")
 		}