diff --git a/libnetwork/internal/resolvconf/resolvconf.go b/libnetwork/internal/resolvconf/resolvconf.go index 6621de64eb..e22983ac13 100644 --- a/libnetwork/internal/resolvconf/resolvconf.go +++ b/libnetwork/internal/resolvconf/resolvconf.go @@ -270,16 +270,6 @@ func (rc *ResolvConf) TransformForIntNS( } rc.nameServers = newNSs - // If there are no external nameservers, and the only nameserver left is the - // internal resolver, use the defaults as ext nameservers. - if len(rc.md.ExtNameServers) == 0 && len(rc.nameServers) == 1 { - log.G(context.TODO()).Info("No non-localhost DNS nameservers are left in resolv.conf. Using default external servers") - for _, addr := range defaultNSAddrs(ipv6) { - rc.md.ExtNameServers = append(rc.md.ExtNameServers, ExtDNSEntry{Addr: addr}) - } - rc.md.UsedDefaultNS = true - } - // For each option required by the nameserver, add it if not already present. If // the option is already present, don't override it. Apart from ndots - if the // ndots value is invalid and an ndots option is required, replace the existing diff --git a/libnetwork/internal/resolvconf/resolvconf_test.go b/libnetwork/internal/resolvconf/resolvconf_test.go index 86217a1085..7e3956610e 100644 --- a/libnetwork/internal/resolvconf/resolvconf_test.go +++ b/libnetwork/internal/resolvconf/resolvconf_test.go @@ -432,24 +432,9 @@ func TestRCTransformForIntNS(t *testing.T) { }, }, { - name: "No host nameserver, no iv6", - input: "", - ipv6: false, - expExtServers: []ExtDNSEntry{ - mke("8.8.8.8", false), - mke("8.8.4.4", false), - }, - }, - { - name: "No host nameserver, iv6", + name: "No host nameserver", input: "", ipv6: true, - expExtServers: []ExtDNSEntry{ - mke("8.8.8.8", false), - mke("8.8.4.4", false), - mke("2001:4860:4860::8888", false), - mke("2001:4860:4860::8844", false), - }, }, { name: "ndots present and required", diff --git a/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_iv6.golden b/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_iv6.golden deleted file mode 100644 index cde7c90bd9..0000000000 --- a/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_iv6.golden +++ /dev/null @@ -1,6 +0,0 @@ -nameserver 127.0.0.11 - -# Based on host file: '/etc/resolv.conf' (internal resolver) -# Used default nameservers. -# ExtServers: [8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844] -# Overrides: [] diff --git a/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_no_iv6.golden b/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver.golden similarity index 62% rename from libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_no_iv6.golden rename to libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver.golden index c620d3442d..29e3120392 100644 --- a/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver,_no_iv6.golden +++ b/libnetwork/internal/resolvconf/testdata/TestRCTransformForIntNS/No_host_nameserver.golden @@ -1,6 +1,4 @@ nameserver 127.0.0.11 # Based on host file: '/etc/resolv.conf' (internal resolver) -# Used default nameservers. -# ExtServers: [8.8.8.8 8.8.4.4] # Overrides: []