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

return all records with matching ip (#3687)

Browse source 
Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver 2020-02-21 01:24:02 -05:00 • committed by GitHub
parent ed1841c36f
commit 6ef105ced3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugin/kubernetes/reverse.go
View file

@ -38,6 +38,7 @@ func (k *Kubernetes) serviceRecordForIP(ip, name string) []msg.Service {
return []msg.Service{{Host: domain, TTL: k.ttl}} return []msg.Service{{Host: domain, TTL: k.ttl}}
} }
// If no cluster ips match, search endpoints // If no cluster ips match, search endpoints
var svcs []msg.Service
for _, ep := range k.APIConn.EpIndexReverse(ip) { for _, ep := range k.APIConn.EpIndexReverse(ip) {
if len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) { if len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) {
continue continue
@ -46,10 +47,10 @@ func (k *Kubernetes) serviceRecordForIP(ip, name string) []msg.Service {
for _, addr := range eps.Addresses { for _, addr := range eps.Addresses {
if addr.IP == ip { if addr.IP == ip {
domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".") domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".")
return []msg.Service{{Host: domain, TTL: k.ttl}} svcs = append(svcs, msg.Service{Host: domain, TTL: k.ttl})
} }
} }
} }
} }
return nil return svcs
} }

73
plugin/kubernetes/reverse_test.go
View file

@ -56,34 +56,51 @@ func (APIConnReverseTest) SvcIndexReverse(ip string) []*object.Service {
} }
func (APIConnReverseTest) EpIndexReverse(ip string) []*object.Endpoints { func (APIConnReverseTest) EpIndexReverse(ip string) []*object.Endpoints {
switch ip { ep1 := object.Endpoints{
case "10.0.0.100": Subsets: []object.EndpointSubset{
case "1234:abcd::1": {
case "fd00:77:30::a": Addresses: []object.EndpointAddress{
case "fd00:77:30::2:9ba6": {IP: "10.0.0.100", Hostname: "ep1a"},
default: {IP: "1234:abcd::1", Hostname: "ep1b"},
return nil {IP: "fd00:77:30::a", Hostname: "ip6svc1ex"},
} {IP: "fd00:77:30::2:9ba6", Hostname: "ip6svc1in"},
eps := []*object.Endpoints{ {IP: "10.0.0.99", Hostname: "double-ep"}, // this endpoint is used by two services
{ },
Subsets: []object.EndpointSubset{ Ports: []object.EndpointPort{
{ {Port: 80, Protocol: "tcp", Name: "http"},
Addresses: []object.EndpointAddress{
{IP: "10.0.0.100", Hostname: "ep1a"},
{IP: "1234:abcd::1", Hostname: "ep1b"},
{IP: "fd00:77:30::a", Hostname: "ip6svc1ex"},
{IP: "fd00:77:30::2:9ba6", Hostname: "ip6svc1in"},
},
Ports: []object.EndpointPort{
{Port: 80, Protocol: "tcp", Name: "http"},
},
}, },
}, },
Name: "svc1",
Namespace: "testns",
}, },
Name: "svc1",
Namespace: "testns",
} }
return eps ep2 := object.Endpoints{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{IP: "10.0.0.99", Hostname: "double-ep"}, // this endpoint is used by two services
},
Ports: []object.EndpointPort{
{Port: 80, Protocol: "tcp", Name: "http"},
},
},
},
Name: "svc2",
Namespace: "testns",
}
switch ip {
case "10.0.0.100":
fallthrough
case "1234:abcd::1":
fallthrough
case "fd00:77:30::a":
fallthrough
case "fd00:77:30::2:9ba6":
return []*object.Endpoints{&ep1}
case "10.0.0.99":
return []*object.Endpoints{&ep1, &ep2}
}
return nil
} }
func (APIConnReverseTest) GetNodeByName(name string) (*api.Node, error) { func (APIConnReverseTest) GetNodeByName(name string) (*api.Node, error) {
@ -178,6 +195,14 @@ func TestReverse(t *testing.T) {
test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1502989566 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1502989566 7200 1800 86400 5"),
}, },
}, },
{
Qname: "99.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
Rcode: dns.RcodeSuccess,
Answer: []dns.RR{
test.PTR("99.0.0.10.in-addr.arpa. 5 IN PTR double-ep.svc1.testns.svc.cluster.local."),
test.PTR("99.0.0.10.in-addr.arpa. 5 IN PTR double-ep.svc2.testns.svc.cluster.local."),
},
},
} }
ctx := context.TODO() ctx := context.TODO()