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

set ttl for ns records (#2452)

Browse source
This commit is contained in:
Chris O'Haver 2019-01-19 05:25:52 -05:00 • committed by Miek Gieben
parent b0d37c5443
commit 278303ca0d
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugin/kubernetes/kubernetes.go
View file

@ -108,7 +108,7 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt plugin.Opti
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), TTL: k.ttl}
return []msg.Service{svc}, nil return []msg.Service{svc}, nil
} }
@ -116,7 +116,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), TTL: k.ttl}
return []msg.Service{svc}, nil return []msg.Service{svc}, nil
} }

14
plugin/kubernetes/kubernetes_apex_test.go
View file

@ -15,45 +15,45 @@ var kubeApexCases = []test.Case{
Qname: "cluster.local.", Qtype: dns.TypeSOA, Qname: "cluster.local.", Qtype: dns.TypeSOA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Answer: []dns.RR{ Answer: []dns.RR{
test.SOA("cluster.local. 303 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
{ {
Qname: "cluster.local.", Qtype: dns.TypeHINFO, Qname: "cluster.local.", Qtype: dns.TypeHINFO,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Ns: []dns.RR{ Ns: []dns.RR{
test.SOA("cluster.local. 303 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
{ {
Qname: "cluster.local.", Qtype: dns.TypeNS, Qname: "cluster.local.", Qtype: dns.TypeNS,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Answer: []dns.RR{ Answer: []dns.RR{
test.NS("cluster.local. 303 IN NS ns.dns.cluster.local."), test.NS("cluster.local. 5 IN NS ns.dns.cluster.local."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
test.A("ns.dns.cluster.local. 303 IN A 127.0.0.1"), test.A("ns.dns.cluster.local. 5 IN A 127.0.0.1"),
}, },
}, },
{ {
Qname: "cluster.local.", Qtype: dns.TypeA, Qname: "cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Ns: []dns.RR{ Ns: []dns.RR{
test.SOA("cluster.local. 303 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
{ {
Qname: "cluster.local.", Qtype: dns.TypeAAAA, Qname: "cluster.local.", Qtype: dns.TypeAAAA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Ns: []dns.RR{ Ns: []dns.RR{
test.SOA("cluster.local. 303 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
{ {
Qname: "cluster.local.", Qtype: dns.TypeSRV, Qname: "cluster.local.", Qtype: dns.TypeSRV,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Ns: []dns.RR{ Ns: []dns.RR{
test.SOA("cluster.local. 303 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
} }