diff options
author | 2018-10-11 21:59:50 +0100 | |
---|---|---|
committer | 2018-10-11 16:59:50 -0400 | |
commit | 6ed88fab744bd3d8cc071153a4c78970798cf9e6 (patch) | |
tree | ab4935e8cb81931b65966ba13829f3f8780b12b3 /plugin/kubernetes/reverse.go | |
parent | c8fb66f8cc60ff17b916b033982c5491f23cdcc9 (diff) | |
download | coredns-6ed88fab744bd3d8cc071153a4c78970798cf9e6.tar.gz coredns-6ed88fab744bd3d8cc071153a4c78970798cf9e6.tar.zst coredns-6ed88fab744bd3d8cc071153a4c78970798cf9e6.zip |
Revert "use keys (#2167)" (#2188)
This reverts commit 974ed086f25ad45a01947e276e2eb8aa73d007a3.
Diffstat (limited to 'plugin/kubernetes/reverse.go')
-rw-r--r-- | plugin/kubernetes/reverse.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/plugin/kubernetes/reverse.go b/plugin/kubernetes/reverse.go index 1e060283c..5873bcbc8 100644 --- a/plugin/kubernetes/reverse.go +++ b/plugin/kubernetes/reverse.go @@ -18,35 +18,35 @@ func (k *Kubernetes) Reverse(state request.Request, exact bool, opt plugin.Optio return nil, e } - record := k.serviceRecordForIP(ip, state.Name()) - if record == nil { - return nil, errNoItems + records := k.serviceRecordForIP(ip, state.Name()) + if len(records) == 0 { + return records, errNoItems } - return []msg.Service{*record}, nil + return records, nil } // serviceRecordForIP gets a service record with a cluster ip matching the ip argument // If a service cluster ip does not match, it checks all endpoints -func (k *Kubernetes) serviceRecordForIP(ip, name string) *msg.Service { +func (k *Kubernetes) serviceRecordForIP(ip, name string) []msg.Service { // First check services with cluster ips - service := k.APIConn.SvcIndexReverse(ip) - if service != nil { + for _, service := range k.APIConn.SvcIndexReverse(ip) { if len(k.Namespaces) > 0 && !k.namespaceExposed(service.Namespace) { - return nil + continue } domain := strings.Join([]string{service.Name, service.Namespace, Svc, k.primaryZone()}, ".") - return &msg.Service{Host: domain, TTL: k.ttl} + return []msg.Service{{Host: domain, TTL: k.ttl}} } // If no cluster ips match, search endpoints - ep := k.APIConn.EpIndexReverse(ip) - if ep == nil || len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) { - return nil - } - for _, eps := range ep.Subsets { - for _, addr := range eps.Addresses { - if addr.IP == ip { - domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".") - return &msg.Service{Host: domain, TTL: k.ttl} + for _, ep := range k.APIConn.EpIndexReverse(ip) { + if len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) { + continue + } + for _, eps := range ep.Subsets { + for _, addr := range eps.Addresses { + if addr.IP == ip { + domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".") + return []msg.Service{{Host: domain, TTL: k.ttl}} + } } } } |