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

Merge pull request #757 from lavalamp/repCtl

Browse Source 
Remove etcd dep from controller manager
This commit is contained in:
brendandburns
2014-08-05 11:47:31 -07:00
parent f87a93af7a b430cebe72
commit cc4300c3ec
4 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/integration/integration.go
View File

@@ -103,7 +103,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
})
handler.delegate = m.ConstructHandler("/api/v1beta1")
controllerManager := controller.MakeReplicationManager(etcdClient, cl)
controllerManager := controller.MakeReplicationManager(cl)
// Prove that controllerManager's watch works by making it not sync until after this
// test is over. (Hopefully we don't take 10 minutes!)