diff options
Diffstat (limited to 'plugin/kubernetes/controller.go')
| -rw-r--r-- | plugin/kubernetes/controller.go | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/plugin/kubernetes/controller.go b/plugin/kubernetes/controller.go index 286f87d8e..db231c89d 100644 --- a/plugin/kubernetes/controller.go +++ b/plugin/kubernetes/controller.go @@ -72,7 +72,7 @@ type dnsControl struct { svcLister cache.Indexer podLister cache.Indexer epLister cache.Indexer - nsLister storeToNamespaceLister + nsLister cache.Store // stopLock is used to enforce only a single call to Stop is active. // Needed because we allow stopping through an http endpoint and @@ -146,7 +146,7 @@ func newdnsController(kubeClient *kubernetes.Clientset, opts dnsControlOpts) *dn cache.Indexers{epNameNamespaceIndex: epNameNamespaceIndexFunc, epIPIndex: epIPIndexFunc}) } - dns.nsLister.Store, dns.nsController = cache.NewInformer( + dns.nsLister, dns.nsController = cache.NewInformer( &cache.ListWatch{ ListFunc: namespaceListFunc(dns.client, dns.selector), WatchFunc: namespaceWatchFunc(dns.client, dns.selector), @@ -156,11 +156,6 @@ func newdnsController(kubeClient *kubernetes.Clientset, opts dnsControlOpts) *dn return &dns } -// storeToNamespaceLister makes a Store that lists Namespaces. -type storeToNamespaceLister struct { - cache.Store -} - func podIPIndexFunc(obj interface{}) ([]string, error) { p, ok := obj.(*api.Pod) if !ok { @@ -311,9 +306,8 @@ func namespaceWatchFunc(c *kubernetes.Clientset, s labels.Selector) func(options } } -func (dns *dnsControl) SetWatchChan(c dnswatch.Chan) { - dns.watchChan = c -} +func (dns *dnsControl) SetWatchChan(c dnswatch.Chan) { dns.watchChan = c } +func (dns *dnsControl) StopWatching(qname string) { delete(dns.watched, qname) } func (dns *dnsControl) Watch(qname string) error { if dns.watchChan == nil { @@ -323,10 +317,6 @@ func (dns *dnsControl) Watch(qname string) error { return nil } -func (dns *dnsControl) StopWatching(qname string) { - delete(dns.watched, qname) -} - // Stop stops the controller. func (dns *dnsControl) Stop() error { dns.stopLock.Lock() @@ -621,15 +611,9 @@ func (dns *dnsControl) sendUpdates(oldObj, newObj interface{}) { } } -func (dns *dnsControl) Add(obj interface{}) { - dns.sendUpdates(nil, obj) -} -func (dns *dnsControl) Delete(obj interface{}) { - dns.sendUpdates(obj, nil) -} -func (dns *dnsControl) Update(oldObj, newObj interface{}) { - dns.sendUpdates(oldObj, newObj) -} +func (dns *dnsControl) Add(obj interface{}) { dns.sendUpdates(nil, obj) } +func (dns *dnsControl) Delete(obj interface{}) { dns.sendUpdates(obj, nil) } +func (dns *dnsControl) Update(oldObj, newObj interface{}) { dns.sendUpdates(oldObj, newObj) } // subsetsEquivalent checks if two endpoint subsets are significantly equivalent // I.e. that they have the same ready addresses, host names, ports (including protocol |