github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 13:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #943 from smarterclayton/only_wait_for_acceptance

Browse Source 
Clients must wait for completion of actions
This commit is contained in:
brendandburns
2014-08-20 21:01:21 -07:00
parent 25b3da718f baaabcaf11
commit 1bd4ae0c62
13 changed files with 328 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/kubelet.go
View File

@@ -138,7 +138,7 @@ func main() {
if len(etcdServerList) > 0 {
glog.Infof("Watching for etcd configs at %v", etcdServerList)
etcdClient = etcd.NewClient(etcdServerList)
kconfig.NewSourceEtcd(kconfig.EtcdKeyForHost(hostname), etcdClient, 30*time.Second, cfg.Channel("etcd"))
kconfig.NewSourceEtcd(kconfig.EtcdKeyForHost(hostname), etcdClient, cfg.Channel("etcd"))
}
// TODO: block until all sources have delivered at least one update to the channel, or break the sync loop