github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

First step of combination.

Browse Source
This commit is contained in:
Daniel Smith
2014-06-22 14:18:01 -07:00
parent e811e24b23
commit 61a494d303
11 changed files with 189 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/controller-manager/controller-manager.go
View File

@@ -47,10 +47,9 @@ func main() {
// Set up logger for etcd client
etcd.SetLogger(log.New(os.Stderr, "etcd ", log.LstdFlags))
controllerManager := controller.MakeReplicationManager(etcd.NewClient([]string{*etcd_servers}),
client.Client{
Host: "http://" + *master,
})
controllerManager := controller.MakeReplicationManager(
etcd.NewClient([]string{*etcd_servers}),
client.New("http://"+*master, nil))
controllerManager.Run(10 * time.Second)
select {}