Merge pull request #1871 from Luap99/pasta-dns

libnetwork/pasta: pass --dns none

Author: openshift-merge-bot[bot]

libnetwork/pasta/pasta.go

@@ -47,6 +47,7 @@ func Setup(opts *SetupOptions) error {
 	NoTCPNamespacePorts := true
 	NoUDPNamespacePorts := true
 	NoMapGW := true
+	NoDNS := true
 
 	path, err := opts.Config.FindHelperBinary(BinaryName, true)
 	if err != nil {
@@ -102,6 +103,8 @@ func Setup(opts *SetupOptions) error {
 			NoMapGW = false
 			// not an actual pasta(1) option
 			cmdArgs = append(cmdArgs[:i], cmdArgs[i+1:]...)
+		case "-D", "--dns", "--dns-forward":
+			NoDNS = false
 		}
 	}
 
@@ -120,6 +123,12 @@ func Setup(opts *SetupOptions) error {
 	if NoMapGW {
 		cmdArgs = append(cmdArgs, "--no-map-gw")
 	}
+	if NoDNS {
+		// disable pasta reading from /etc/resolv.conf which hides the
+		// "Couldn't get any nameserver address" warning when only
+		// localhost resolvers are configured.
+		cmdArgs = append(cmdArgs, "--dns", "none")
+	}
 
 	// always pass --quiet to silence the info output from pasta
 	cmdArgs = append(cmdArgs, "--quiet", "--netns", opts.Netns)