github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21496 from ncdc/fix-ds-type-in-nodecontroller-informer

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-18 15:01:14 -08:00
parent a39b62bb22 49fb450a36
commit d8c493a274
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/node/nodecontroller.go
View File

@@ -27,6 +27,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
@@ -207,7 +208,7 @@ func NewNodeController(
return nc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(options) return nc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(options)
}, },
}, },
&api.Node{}, &extensions.DaemonSet{},
controller.NoResyncPeriodFunc(), controller.NoResyncPeriodFunc(),
framework.ResourceEventHandlerFuncs{}, framework.ResourceEventHandlerFuncs{},
) )