diff options
| author |  Chris O'Haver <cohaver@infoblox.com>
| 2019-01-19 05:25:52 -0500 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2019-01-19 10:25:52 +0000 |
| commit | 278303ca0df6e6167788fa3435f6ea7c6253157b (patch) | |
| tree | 37812288d56d9aa2ae1ebad788deb65c25c7b93f | |
| parent | b0d37c54431c7889eabe5b181e450cf60d0731e9 (diff) | |
| download | coredns-278303ca0df6e6167788fa3435f6ea7c6253157b.tar.gz coredns-278303ca0df6e6167788fa3435f6ea7c6253157b.tar.zst coredns-278303ca0df6e6167788fa3435f6ea7c6253157b.zip | |
set ttl for ns records (#2452)
| -rw-r--r-- | plugin/kubernetes/kubernetes.go | 4 | ||||
| -rw-r--r-- | plugin/kubernetes/kubernetes_apex_test.go | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index 56948d40a..31bf47dba 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -108,7 +108,7 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt plugin.Opti case dns.TypeNS: // We can only get here if the qname equals the zone, see ServeDNS in handler.go. 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 } @@ -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. // SOA records always use this hardcoded name 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 } diff --git a/plugin/kubernetes/kubernetes_apex_test.go b/plugin/kubernetes/kubernetes_apex_test.go index 3f580223e..9b00658bb 100644 --- a/plugin/kubernetes/kubernetes_apex_test.go +++ b/plugin/kubernetes/kubernetes_apex_test.go @@ -15,45 +15,45 @@ var kubeApexCases = []test.Case{ Qname: "cluster.local.", Qtype: dns.TypeSOA, Rcode: dns.RcodeSuccess, 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, Rcode: dns.RcodeSuccess, 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, Rcode: dns.RcodeSuccess, 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{ - 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, Rcode: dns.RcodeSuccess, 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, Rcode: dns.RcodeSuccess, 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, Rcode: dns.RcodeSuccess, 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"), }, }, } |