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

Fix build error by change kubernetes controller to pkg/client/cache (#262)

Browse source 
Kubernetes moves informer and controller to pkg/client/cache, see:
https://github.com/kubernetes/kubernetes/pull/32718

As a result, coredns build is broken.

This fix fixes the build by making related change with kubernetes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-09-16 08:31:23 -07:00 • committed by Miek Gieben
parent 953cfc1de4
commit 50d47a55a2
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
middleware/kubernetes/controller.go
View file

@ -10,7 +10,6 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"
@ -25,9 +24,9 @@ type dnsController struct {
selector *labels.Selector selector *labels.Selector
endpController *framework.Controller endpController *cache.Controller
svcController *framework.Controller svcController *cache.Controller
nsController *framework.Controller nsController *cache.Controller
svcLister cache.StoreToServiceLister svcLister cache.StoreToServiceLister
endpLister cache.StoreToEndpointsLister endpLister cache.StoreToEndpointsLister
@ -49,26 +48,26 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse
stopCh: make(chan struct{}), stopCh: make(chan struct{}),
} }
dns.endpLister.Store, dns.endpController = framework.NewInformer( dns.endpLister.Store, dns.endpController = cache.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: endpointsListFunc(dns.client, namespace, dns.selector), ListFunc: endpointsListFunc(dns.client, namespace, dns.selector),
WatchFunc: endpointsWatchFunc(dns.client, namespace, dns.selector), WatchFunc: endpointsWatchFunc(dns.client, namespace, dns.selector),
}, },
&api.Endpoints{}, resyncPeriod, framework.ResourceEventHandlerFuncs{}) &api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
dns.svcLister.Store, dns.svcController = framework.NewInformer( dns.svcLister.Store, dns.svcController = cache.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: serviceListFunc(dns.client, namespace, dns.selector), ListFunc: serviceListFunc(dns.client, namespace, dns.selector),
WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector), WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector),
}, },
&api.Service{}, resyncPeriod, framework.ResourceEventHandlerFuncs{}) &api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
dns.nsLister.Store, dns.nsController = framework.NewInformer( dns.nsLister.Store, dns.nsController = cache.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: namespaceListFunc(dns.client, dns.selector), ListFunc: namespaceListFunc(dns.client, dns.selector),
WatchFunc: namespaceWatchFunc(dns.client, dns.selector), WatchFunc: namespaceWatchFunc(dns.client, dns.selector),
}, },
&api.Namespace{}, resyncPeriod, framework.ResourceEventHandlerFuncs{}) &api.Namespace{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
return &dns return &dns
} }