mw/k8s: remove k.defaultNsMsg() (#892)

Remove k.defaultNSMsg() it is just one line of getting the service and
it is another method that needlessly uses recordRequest.

2 files changed, 3 insertions, 16 deletions

diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index 87c9fd4a7..e710e60f9 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -130,8 +130,9 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
 		if state.Type() == "A" && isDefaultNS(state.Name(), r) {
 			// If this is an A request for "ns.dns", respond with a "fake" record for coredns.
 			// SOA records always use this hardcoded name
-			svcs = append(svcs, k.defaultNSMsg(r))
-			return svcs, nil, nil
+			ns := k.nsAddr()
+			svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")}
+			return []msg.Service{svc}, nil, nil
 		}
 		s, e := k.Entries(r)
 		if state.QType() == dns.TypeAAAA {
diff --git a/middleware/kubernetes/ns.go b/middleware/kubernetes/ns.go
index 8f521e36a..28de73f2a 100644
--- a/middleware/kubernetes/ns.go
+++ b/middleware/kubernetes/ns.go
@@ -4,24 +4,10 @@ import (
 	"net"
 	"strings"
 
-	"github.com/coredns/coredns/middleware/etcd/msg"
-
 	"github.com/miekg/dns"
 	"k8s.io/client-go/1.5/pkg/api"
 )
 
-// DefaultNSMsg returns an msg.Service representing an A record for
-// ns.dns.[zone] -> dns service ip. This A record is needed to legitimize
-// the SOA response in middleware.NS(), which is hardcoded at ns.dns.[zone].
-func (k *Kubernetes) defaultNSMsg(r recordRequest) msg.Service {
-	ns := k.nsAddr()
-	s := msg.Service{
-		Key:  msg.Path(strings.Join([]string{defaultNSName, r.zone}, "."), "coredns"),
-		Host: ns.A.String(),
-	}
-	return s
-}
-
 func isDefaultNS(name string, r recordRequest) bool {
 	return strings.Index(name, defaultNSName) == 0 && strings.Index(name, r.zone) == len(defaultNSName)
 }