Merge pull request #443 from jandubois/empty-resolv-conf

Allow empty list of nameservers

pkg/services/dns/dns_config_unix.go

@@ -3,16 +3,13 @@
 package dns
 
 import (
-	"errors"
 	"net"
 	"net/netip"
 
 	"github.com/miekg/dns"
 	log "github.com/sirupsen/logrus"
 )
 
-var errEmptyResolvConf = errors.New("no DNS servers configured in /etc/resolv.conf")
-
 func getDNSHostAndPort() ([]string, error) {
 	conf, err := dns.ClientConfigFromFile("/etc/resolv.conf")
 	if err != nil {
@@ -31,8 +28,5 @@ func getDNSHostAndPort() ([]string, error) {
 		}
 	}
 
-	if len(hosts) == 0 {
-		return []string{}, errEmptyResolvConf
-	}
 	return hosts, nil
 }

pkg/services/dns/dns_test.go

@@ -2,7 +2,6 @@ package dns
 
 import (
 	"context"
-	"errors"
 	"net"
 	"testing"
 	"time"
@@ -24,11 +23,7 @@ var _ = ginkgo.Describe("dns add test", func() {
 	var server *Server
 
 	ginkgo.BeforeEach(func() {
-		var err error
-		server, err = New(nil, nil, []types.Zone{})
-		if errors.Is(err, errEmptyResolvConf) {
-			ginkgo.Skip("Skipping test, no DNS Servers found")
-		}
+		server, _ = New(nil, nil, []types.Zone{})
 	})
 
 	ginkgo.It("should add dns zone with ip", func() {
@@ -235,10 +230,10 @@ type ARecord struct {
 func TestDNS(t *testing.T) {
 	log.Infof("starting test DNS servers")
 	nameserver, cleanup, err := startDNSServer()
-	if errors.Is(err, errEmptyResolvConf) {
+	require.NoError(t, err)
+	if len(nameserver) == 0 {
 		t.Skip("Failed to setup start DNS server, skipping test")
 	}
-	require.NoError(t, err)
 	defer cleanup()
 	time.Sleep(100 * time.Millisecond)
 	log.Infof("test DNS servers started")