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

plugin/kubernetes: make prefix key in msg.Service a const (#2378)

Browse source 
This is a relic from the etcd integration and only used to remove in the
final answer returned to the client. We do need it. Make it a constant
and only one character wide.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2018-12-08 13:37:00 +00:00 • committed by Yong Tang
parent 65be561722
commit f02da83e9c
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugin/kubernetes/kubernetes.go
View file

@ -105,13 +105,13 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt plugin.Opti
if segs[0] != "dns-version" { if segs[0] != "dns-version" {
return nil, nil return nil, nil
} }
svc := msg.Service{Text: DNSSchemaVersion, TTL: 28800, Key: msg.Path(state.QName(), "coredns")} svc := msg.Service{Text: DNSSchemaVersion, TTL: 28800, Key: msg.Path(state.QName(), coredns)}
return []msg.Service{svc}, nil return []msg.Service{svc}, nil
case dns.TypeNS: case dns.TypeNS:
// We can only get here if the qname equals the zone, see ServeDNS in handler.go. // We can only get here if the qname equals the zone, see ServeDNS in handler.go.
ns := k.nsAddr() ns := k.nsAddr()
svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")} svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), coredns)}
return []msg.Service{svc}, nil return []msg.Service{svc}, nil
} }
@ -119,7 +119,7 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt plugin.Opti
// 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
ns := k.nsAddr() ns := k.nsAddr()
svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")} svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), coredns)}
return []msg.Service{svc}, nil return []msg.Service{svc}, nil
} }
@ -349,7 +349,7 @@ func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service,
namespace := r.namespace namespace := r.namespace
podname := r.service podname := r.service
zonePath := msg.Path(zone, "coredns") zonePath := msg.Path(zone, coredns)
ip := "" ip := ""
// handle empty pod name // handle empty pod name
@ -414,7 +414,7 @@ func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service,
// findServices returns the services matching r from the cache. // findServices returns the services matching r from the cache.
func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.Service, err error) { func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.Service, err error) {
zonePath := msg.Path(zone, "coredns") zonePath := msg.Path(zone, coredns)
err = errNoItems err = errNoItems
if wildcard(r.service) && !wildcard(r.namespace) { if wildcard(r.service) && !wildcard(r.namespace) {
@ -555,3 +555,5 @@ func match(a, b string) bool {
func wildcard(s string) bool { func wildcard(s string) bool {
return s == "*" || s == "any" return s == "*" || s == "any"
} }
const coredns = "c" // used as a fake key prefix in msg.Service

8
plugin/kubernetes/kubernetes_test.go
View file

@ -272,12 +272,12 @@ func TestServices(t *testing.T) {
} }
tests := []svcTest{ tests := []svcTest{
// Cluster IP Services // Cluster IP Services
{qname: "svc1.testns.svc.interwebs.test.", qtype: dns.TypeA, answer: svcAns{host: "10.0.0.1", key: "/coredns/test/interwebs/svc/testns/svc1"}}, {qname: "svc1.testns.svc.interwebs.test.", qtype: dns.TypeA, answer: svcAns{host: "10.0.0.1", key: "/" + coredns + "/test/interwebs/svc/testns/svc1"}},
{qname: "_http._tcp.svc1.testns.svc.interwebs.test.", qtype: dns.TypeSRV, answer: svcAns{host: "10.0.0.1", key: "/coredns/test/interwebs/svc/testns/svc1"}}, {qname: "_http._tcp.svc1.testns.svc.interwebs.test.", qtype: dns.TypeSRV, answer: svcAns{host: "10.0.0.1", key: "/" + coredns + "/test/interwebs/svc/testns/svc1"}},
{qname: "ep1a.svc1.testns.svc.interwebs.test.", qtype: dns.TypeA, answer: svcAns{host: "172.0.0.1", key: "/coredns/test/interwebs/svc/testns/svc1/ep1a"}}, {qname: "ep1a.svc1.testns.svc.interwebs.test.", qtype: dns.TypeA, answer: svcAns{host: "172.0.0.1", key: "/" + coredns + "/test/interwebs/svc/testns/svc1/ep1a"}},
// External Services // External Services
{qname: "external.testns.svc.interwebs.test.", qtype: dns.TypeCNAME, answer: svcAns{host: "coredns.io", key: "/coredns/test/interwebs/svc/testns/external"}}, {qname: "external.testns.svc.interwebs.test.", qtype: dns.TypeCNAME, answer: svcAns{host: "coredns.io", key: "/" + coredns + "/test/interwebs/svc/testns/external"}},
} }
for i, test := range tests { for i, test := range tests {