From 6ed88fab744bd3d8cc071153a4c78970798cf9e6 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Thu, 11 Oct 2018 21:59:50 +0100
Subject: Revert "use keys (#2167)" (#2188)

This reverts commit 974ed086f25ad45a01947e276e2eb8aa73d007a3.
---
 plugin/kubernetes/ns.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'plugin/kubernetes/ns.go')

diff --git a/plugin/kubernetes/ns.go b/plugin/kubernetes/ns.go
index 722dc9ef4..2ccb51ef3 100644
--- a/plugin/kubernetes/ns.go
+++ b/plugin/kubernetes/ns.go
@@ -4,7 +4,6 @@ import (
 	"net"
 	"strings"
 
-	"github.com/coredns/coredns/plugin/kubernetes/object"
 	"github.com/miekg/dns"
 	api "k8s.io/api/core/v1"
 )
@@ -23,9 +22,8 @@ func (k *Kubernetes) nsAddr() *dns.A {
 	localIP := k.interfaceAddrsFunc()
 	rr.A = localIP
 
-	ep := k.APIConn.EpIndexReverse(localIP.String())
-	if ep != nil {
-	FindEndpoint:
+FindEndpoint:
+	for _, ep := range k.APIConn.EpIndexReverse(localIP.String()) {
 		for _, eps := range ep.Subsets {
 			for _, addr := range eps.Addresses {
 				if localIP.Equal(net.ParseIP(addr.IP)) {
@@ -43,12 +41,15 @@ func (k *Kubernetes) nsAddr() *dns.A {
 		return rr
 	}
 
-	svc := k.APIConn.SvcIndex(object.ServiceKey(svcNamespace, svcName))
-	if svc != nil {
-		if svc.ClusterIP == api.ClusterIPNone {
-			rr.A = localIP
-		} else {
-			rr.A = net.ParseIP(svc.ClusterIP)
+FindService:
+	for _, svc := range k.APIConn.ServiceList() {
+		if svcName == svc.Name && svcNamespace == svc.Namespace {
+			if svc.ClusterIP == api.ClusterIPNone {
+				rr.A = localIP
+			} else {
+				rr.A = net.ParseIP(svc.ClusterIP)
+			}
+			break FindService
 		}
 	}
 
-- 
cgit v1.2.3