Remove feature flag "windows-dns-proxy"
Added in 26.1.0, commit6c68be24a2Default changed to true in 27.0.0, commit33f9a5329aNo sign of problems so, remove. Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
1 parent
87365d9f28
commit
b79bba6b68
7 files changed
+4
-26
No files matched your search
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -92,7 +92,6 @@ type resolvConfPathConfig struct {
|
||||
}
|
||||
|
||||
type containerConfig struct {
|
||||
containerConfigOS //nolint:nolintlint,unused // only populated on windows
|
||||
hostsPathConfig
|
||||
resolvConfPathConfig
|
||||
generic map[string]interface{}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package libnetwork
|
||||
|
||||
func OptionDNSNoProxy() SandboxOption {
|
||||
return func(sb *Sandbox) {
|
||||
sb.config.dnsNoProxy = true
|
||||
}
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user