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

WIP: autopath as middleware (#859)

Browse source 
autopath as middleware
This commit is contained in:
Miek Gieben 2017-08-09 03:13:38 -07:00 • committed by GitHub
parent c3705ec68c
commit b46b9880bd
20 changed files with 597 additions and 642 deletions
Download patch file Download diff file Expand all files Collapse all files

19
middleware/kubernetes/kubernetes.go
View file

@ -11,7 +11,6 @@ import (
"github.com/coredns/coredns/middleware"
"github.com/coredns/coredns/middleware/etcd/msg"
"github.com/coredns/coredns/middleware/kubernetes/autopath"
"github.com/coredns/coredns/middleware/pkg/dnsutil"
dnsstrings "github.com/coredns/coredns/middleware/pkg/strings"
"github.com/coredns/coredns/middleware/proxy"
@ -47,7 +46,6 @@ type Kubernetes struct {
ReverseCidrs []net.IPNet
Fallthrough bool
autoPath *autopath.AutoPath
interfaceAddrsFunc func() net.IP
}
@ -252,7 +250,7 @@ func (k *Kubernetes) InitKubeCache() (err error) {
}
opts := dnsControlOpts{
initPodCache: (k.PodMode == PodModeVerified || (k.autoPath != nil)),
initPodCache: k.PodMode == PodModeVerified,
}
k.APIConn = newdnsController(kubeClient, k.ResyncPeriod, k.Selector, opts)
@ -460,21 +458,6 @@ func (k *Kubernetes) getRecordsForK8sItems(services []service, pods []pod, r rec
return records
}
func (k *Kubernetes) findPodWithIP(ip string) (p *api.Pod) {
if k.autoPath == nil {
return nil
}
objList := k.APIConn.PodIndex(ip)
for _, o := range objList {
p, ok := o.(*api.Pod)
if !ok {
return nil
}
return p
}
return nil
}
func (k *Kubernetes) findPods(namespace, podname string) (pods []pod, err error) {
if k.PodMode == PodModeDisabled {
return pods, errPodsDisabled