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

plugin/kubernetes: set TTL on pod responses (#1239)

Browse source 
The TTL was still zero, instead it should adhere to the k.ttl setting.
Change this and update tests to match.
This commit is contained in:
Miek Gieben 2017-11-15 14:06:37 +00:00 • committed by GitHub
parent 99dd8f99f3
commit 621dd36f6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugin/kubernetes/handler_pod_insecure_test.go
View file

@ -15,14 +15,14 @@ var podModeInsecureCases = []test.Case{
Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA, Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Answer: []dns.RR{ Answer: []dns.RR{
test.A("10-240-0-1.podns.pod.cluster.local. 0 IN A 10.240.0.1"), test.A("10-240-0-1.podns.pod.cluster.local. 5 IN A 10.240.0.1"),
}, },
}, },
{ {
Qname: "172-0-0-2.podns.pod.cluster.local.", Qtype: dns.TypeA, Qname: "172-0-0-2.podns.pod.cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Answer: []dns.RR{ Answer: []dns.RR{
test.A("172-0-0-2.podns.pod.cluster.local. 0 IN A 172.0.0.2"), test.A("172-0-0-2.podns.pod.cluster.local. 5 IN A 172.0.0.2"),
}, },
}, },
} }

2
plugin/kubernetes/handler_pod_verified_test.go
View file

@ -15,7 +15,7 @@ var podModeVerifiedCases = []test.Case{
Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA, Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess, Rcode: dns.RcodeSuccess,
Answer: []dns.RR{ Answer: []dns.RR{
test.A("10-240-0-1.podns.pod.cluster.local. 0 IN A 10.240.0.1"), test.A("10-240-0-1.podns.pod.cluster.local. 5 IN A 10.240.0.1"),
}, },
}, },
{ {

4
plugin/kubernetes/kubernetes.go
View file

@ -320,7 +320,7 @@ func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service,
} }
if k.podMode == podModeInsecure { if k.podMode == podModeInsecure {
return []msg.Service{{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip}}, nil return []msg.Service{{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip, TTL: k.ttl}}, nil
} }
// PodModeVerified // PodModeVerified
@ -331,7 +331,7 @@ func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service,
} }
// check for matching ip and namespace // check for matching ip and namespace
if ip == p.Status.PodIP && match(namespace, p.Namespace) { if ip == p.Status.PodIP && match(namespace, p.Namespace) {
s := msg.Service{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip} s := msg.Service{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip, TTL: k.ttl}
pods = append(pods, s) pods = append(pods, s)
err = nil err = nil