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

Merge pull request #22038 from mqliang/daemonset-cache

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-05 03:38:55 -08:00
parent 953e21c8f9 7e1ab26c06
commit 2808973503
9 changed files with 782 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/daemon/controller_test.go
View File

@@ -133,7 +133,7 @@ func addPods(podStore cache.Store, nodeName string, label map[string]string, num
func newTestController() (*DaemonSetsController, *controller.FakePodControl) {
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Default.GroupVersion()}})
manager := NewDaemonSetsController(clientset, controller.NoResyncPeriodFunc)
manager := NewDaemonSetsController(clientset, controller.NoResyncPeriodFunc, 0)
manager.podStoreSynced = alwaysReady
podControl := &controller.FakePodControl{}
manager.podControl = podControl