diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-08-03 23:14:11 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-08-03 23:14:11 -0700 |
| commit | 2c0fc3182caa2d76a2c83a2a3b85ec5c5fa8f915 (patch) | |
| tree | 2bfcbe14239c1dbd6f6c7a1161630c3dd05e05d7 /middleware/kubernetes/ns.go | |
| parent | 8ad8c75ab41023f894b0d2886bd93c2ba20993ef (diff) | |
| download | coredns-2c0fc3182caa2d76a2c83a2a3b85ec5c5fa8f915.tar.gz coredns-2c0fc3182caa2d76a2c83a2a3b85ec5c5fa8f915.tar.zst coredns-2c0fc3182caa2d76a2c83a2a3b85ec5c5fa8f915.zip | |
middleware/kubernetes: cleanup (#818)
Drop the interfaceAddr interfaces and just use a function. Cleanup
all fallout from that. Remove the use of global variables and cleanup
the tests a bit.
Diffstat (limited to 'middleware/kubernetes/ns.go')
| -rw-r--r-- | middleware/kubernetes/ns.go | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/middleware/kubernetes/ns.go b/middleware/kubernetes/ns.go index af6f83f21..488713d8b 100644 --- a/middleware/kubernetes/ns.go +++ b/middleware/kubernetes/ns.go @@ -41,25 +41,15 @@ func isDefaultNS(name string, r recordRequest) bool { } func (k *Kubernetes) coreDNSRecord() dns.A { - var localIP net.IP - var svcName string - var svcNamespace string - var dnsIP net.IP + var ( + svcName string + svcNamespace string + dnsIP net.IP + ) if len(corednsRecord.Hdr.Name) == 0 || corednsRecord.A == nil { // get local Pod IP - addrs, _ := k.interfaceAddrs.interfaceAddrs() - - for _, addr := range addrs { - ip, _, _ := net.ParseCIDR(addr.String()) - ip = ip.To4() - - if ip == nil || ip.IsLoopback() { - continue - } - localIP = ip - break - } + localIP := k.interfaceAddrsFunc() // Find endpoint matching IP to get service and namespace endpointsList := k.APIConn.EndpointsList() |