Merge pull request moby#47826 from robmry/windns_proxy_default

Default to "windows-dns-proxy":true

daemon/container_operations_windows.go

@@ -164,10 +164,10 @@ func serviceDiscoveryOnDefaultNetwork() bool {
 }
 
 func buildSandboxPlatformOptions(container *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
-	// By default, the Windows internal resolver does not forward requests to
-	// external resolvers - but forwarding can be enabled using feature flag
-	// "windows-dns-proxy":true.
-	if doproxy, exists := cfg.Features["windows-dns-proxy"]; !exists || !doproxy {
+	// By default, the Windows internal resolver forwards requests to external
+	// resolvers - but forwarding can be disabled using feature flag
+	// "windows-dns-proxy":false.
+	if doproxy, exists := cfg.Features["windows-dns-proxy"]; exists && !doproxy {
 		*sboxOptions = append(*sboxOptions, libnetwork.OptionDNSNoProxy())
 	}
 	return nil

integration/networking/resolvconf_test.go

@@ -206,10 +206,7 @@ func TestNslookupWindows(t *testing.T) {
 	defer c.ContainerRemove(ctx, res.ContainerID, containertypes.RemoveOptions{Force: true})
 
 	assert.Check(t, is.Equal(res.ExitCode, 0))
-	// Current default is to not-forward requests to external servers, which
+	// Current default is to forward requests to external servers, which
 	// can only be changed in daemon.json using feature flag "windows-dns-proxy".
-	// So, expect the lookup to fail...
-	assert.Check(t, is.Contains(res.Stderr.String(), "Server failed"))
-	// When the default behaviour is changed, nslookup should succeed...
-	//assert.Check(t, is.Contains(res.Stdout.String(), "Addresses:"))
+	assert.Check(t, is.Contains(res.Stdout.String(), "Addresses:"))
 }