Merge pull request moby#48738 from robmry/47732_remove_windows-dns-pr…

…oxy_featflag

Remove feature flag "windows-dns-proxy"

daemon/config/config_linux.go

@@ -208,10 +208,6 @@ func (conf *Config) ValidatePlatformConfig() error {
 		return errors.Wrap(err, "invalid fixed-cidr-v6")
 	}
 
-	if _, ok := conf.Features["windows-dns-proxy"]; ok {
-		return errors.New("feature option 'windows-dns-proxy' is only available on Windows")
-	}
-
 	return verifyDefaultCgroupNsMode(conf.CgroupNamespaceMode)
 }
 

daemon/container_operations_windows.go

@@ -164,12 +164,6 @@ func serviceDiscoveryOnDefaultNetwork() bool {
 }
 
 func buildSandboxPlatformOptions(ctr *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
-	// 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
 }
 

daemon/info_windows.go

@@ -11,6 +11,10 @@ import (
 
 // fillPlatformInfo fills the platform related info.
 func (daemon *Daemon) fillPlatformInfo(ctx context.Context, v *system.Info, sysInfo *sysinfo.SysInfo, cfg *configStore) error {
+	if _, ok := cfg.Features["windows-dns-proxy"]; ok {
+		v.Warnings = append(v.Warnings, `
+WARNING: Feature flag "windows-dns-proxy" has been removed, forwarding to external DNS resolvers is enabled.`)
+	}
 	return nil
 }
 

libnetwork/network_windows.go

@@ -103,9 +103,6 @@ func addEpToResolver(
 	epIface *EndpointInterface,
 	resolvers []*Resolver,
 ) error {
-	if config.dnsNoProxy {
-		return nil
-	}
 	hnsEndpoints, err := hcsshim.HNSListEndpointRequest()
 	if err != nil {
 		return nil

libnetwork/sandbox.go

@@ -92,7 +92,6 @@ type resolvConfPathConfig struct {
 }
 
 type containerConfig struct {
-	containerConfigOS //nolint:nolintlint,unused // only populated on windows
 	hostsPathConfig
 	resolvConfPathConfig
 	generic           map[string]interface{}

libnetwork/sandbox_windows.go

@@ -6,11 +6,6 @@ import (
 	"github.com/docker/docker/libnetwork/osl"
 )
 
-// Windows-specific container configuration flags.
-type containerConfigOS struct {
-	dnsNoProxy bool
-}
-
 func releaseOSSboxResources(*osl.Namespace, *Endpoint) {}
 
 func (sb *Sandbox) updateGateway(*Endpoint) error {