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

make ignore empty work with ext svc types (#2823)

Browse source
This commit is contained in:
Chris O'Haver 2019-05-07 20:31:50 -04:00 • committed by John Belamaric
parent 6e1c57acfa
commit c147e20373
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugin/kubernetes/handler_ignore_emptyservice_test.go
View file

@ -19,6 +19,14 @@ var dnsEmptyServiceTestCases = []test.Case{
test.SOA("cluster.local. 5 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"),
}, },
}, },
// CNAME to external
{
Qname: "external.testns.svc.cluster.local.", Qtype: dns.TypeCNAME,
Rcode: dns.RcodeSuccess,
Answer: []dns.RR{
test.CNAME("external.testns.svc.cluster.local. 5 IN CNAME ext.interwebs.test."),
},
},
} }
func TestServeDNSEmptyService(t *testing.T) { func TestServeDNSEmptyService(t *testing.T) {

4
plugin/kubernetes/kubernetes.go
View file

@ -439,7 +439,9 @@ func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.
continue continue
} }
if k.opts.ignoreEmptyService && svc.ClusterIP != api.ClusterIPNone { // If "ignore empty_service" option is set and no endpoints exist, return NXDOMAIN unless
// it's a headless or externalName service (covered below).
if k.opts.ignoreEmptyService && svc.ClusterIP != api.ClusterIPNone && svc.Type != api.ServiceTypeExternalName {
// serve NXDOMAIN if no endpoint is able to answer // serve NXDOMAIN if no endpoint is able to answer
podsCount := 0 podsCount := 0
for _, ep := range endpointsListFunc() { for _, ep := range endpointsListFunc() {