TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

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

Browse source 
Remove k.defaultNSMsg() it is just one line of getting the service and
it is another method that needlessly uses recordRequest.
This commit is contained in:
Miek Gieben 2017-08-11 08:34:35 +01:00 • committed by GitHub
parent c0f62e3f65
commit b5d2a82ed7
2 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
middleware/kubernetes/kubernetes.go
View file

@ -130,8 +130,9 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
if state.Type() == "A" && isDefaultNS(state.Name(), r) { if state.Type() == "A" && isDefaultNS(state.Name(), r) {
// If this is an A request for "ns.dns", respond with a "fake" record for coredns. // If this is an A request for "ns.dns", respond with a "fake" record for coredns.
// SOA records always use this hardcoded name // SOA records always use this hardcoded name
svcs = append(svcs, k.defaultNSMsg(r)) ns := k.nsAddr()
return svcs, nil, nil svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")}
return []msg.Service{svc}, nil, nil
} }
s, e := k.Entries(r) s, e := k.Entries(r)
if state.QType() == dns.TypeAAAA { if state.QType() == dns.TypeAAAA {

14
middleware/kubernetes/ns.go
View file

@ -4,24 +4,10 @@ import (
"net" "net"
"strings" "strings"
"github.com/coredns/coredns/middleware/etcd/msg"
"github.com/miekg/dns" "github.com/miekg/dns"
"k8s.io/client-go/1.5/pkg/api" "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 { func isDefaultNS(name string, r recordRequest) bool {
return strings.Index(name, defaultNSName) == 0 && strings.Index(name, r.zone) == len(defaultNSName) return strings.Index(name, defaultNSName) == 0 && strings.Index(name, r.zone) == len(defaultNSName)
} }