Merge pull request #5875 from rhatdan/network

Cleanup network option parsing

3 files changed, 17 insertions, 18 deletions

diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go
index 9152e7ee7..c24869784 100644
--- a/pkg/specgen/container_validate.go
+++ b/pkg/specgen/container_validate.go
@@ -91,13 +91,13 @@ func (s *SpecGenerator) Validate() error {
 	}
 	// useimageresolveconf conflicts with dnsserver, dnssearch, dnsoption
 	if s.UseImageResolvConf {
-		if len(s.DNSServer) > 0 {
+		if len(s.DNSServers) > 0 {
 			return exclusiveOptions("UseImageResolvConf", "DNSServer")
 		}
 		if len(s.DNSSearch) > 0 {
 			return exclusiveOptions("UseImageResolvConf", "DNSSearch")
 		}
-		if len(s.DNSOption) > 0 {
+		if len(s.DNSOptions) > 0 {
 			return exclusiveOptions("UseImageResolvConf", "DNSOption")
 		}
 	}
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index 53ae335c3..16a1c048f 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -145,20 +145,19 @@ func GenerateNamespaceContainerOpts(s *specgen.SpecGenerator, rt *libpod.Runtime
 	if len(s.DNSSearch) > 0 {
 		options = append(options, libpod.WithDNSSearch(s.DNSSearch))
 	}
-	if len(s.DNSServer) > 0 {
-		// TODO I'm not sure how we are going to handle this given the input
-		if len(s.DNSServer) == 1 { //&& strings.ToLower(s.DNSServer[0].) == "none" {
-			options = append(options, libpod.WithUseImageResolvConf())
-		} else {
-			var dnsServers []string
-			for _, d := range s.DNSServer {
-				dnsServers = append(dnsServers, d.String())
-			}
-			options = append(options, libpod.WithDNS(dnsServers))
+
+	if s.UseImageResolvConf {
+		options = append(options, libpod.WithUseImageResolvConf())
+	} else {
+		var dnsServers []string
+		for _, d := range s.DNSServers {
+			dnsServers = append(dnsServers, d.String())
 		}
+		options = append(options, libpod.WithDNS(dnsServers))
 	}
-	if len(s.DNSOption) > 0 {
-		options = append(options, libpod.WithDNSOption(s.DNSOption))
+
+	if len(s.DNSOptions) > 0 {
+		options = append(options, libpod.WithDNSOption(s.DNSOptions))
 	}
 	if s.StaticIP != nil {
 		options = append(options, libpod.WithStaticIP(*s.StaticIP))
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index 1a05733f9..0b568dd5c 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -319,24 +319,24 @@ type ContainerNetworkConfig struct {
 	// by Podman, but instead sourced from the image.
 	// Conflicts with DNSServer, DNSSearch, DNSOption.
 	UseImageResolvConf bool `json:"use_image_resolve_conf,omitempty"`
-	// DNSServer is a set of DNS servers that will be used in the
+	// DNSServers is a set of DNS servers that will be used in the
 	// container's resolv.conf, replacing the host's DNS Servers which are
 	// used by default.
 	// Conflicts with UseImageResolvConf.
 	// Optional.
-	DNSServer []net.IP `json:"dns_server,omitempty"`
+	DNSServers []net.IP `json:"dns_server,omitempty"`
 	// DNSSearch is a set of DNS search domains that will be used in the
 	// container's resolv.conf, replacing the host's DNS search domains
 	// which are used by default.
 	// Conflicts with UseImageResolvConf.
 	// Optional.
 	DNSSearch []string `json:"dns_search,omitempty"`
-	// DNSOption is a set of DNS options that will be used in the
+	// DNSOptions is a set of DNS options that will be used in the
 	// container's resolv.conf, replacing the host's DNS options which are
 	// used by default.
 	// Conflicts with UseImageResolvConf.
 	// Optional.
-	DNSOption []string `json:"dns_option,omitempty"`
+	DNSOptions []string `json:"dns_option,omitempty"`
 	// UseImageHosts indicates that /etc/hosts should not be managed by
 	// Podman, and instead sourced from the image.
 	// Conflicts with HostAdd.