Separate deletion and termination evictors in NodeController, and fix rate_limited_queue.go

This commit is contained in:
gmarek
2015-09-29 11:29:51 +02:00
parent 5d07236be6
commit a3723e2045
7 changed files with 17 additions and 15 deletions

View File

@@ -202,7 +202,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
// TODO: Write an integration test for the replication controllers watch.
go controllerManager.Run(3, util.NeverStop)
nodeController := nodecontroller.NewNodeController(nil, cl, 5*time.Minute, util.NewFakeRateLimiter(),
nodeController := nodecontroller.NewNodeController(nil, cl, 5*time.Minute, util.NewFakeRateLimiter(), util.NewFakeRateLimiter(),
40*time.Second, 60*time.Second, 5*time.Second, nil, false)
nodeController.Run(5 * time.Second)
cadvisorInterface := new(cadvisor.Fake)