github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Run 'etcd2' if it exists, in preference to 'etcd'

Browse Source 
This is to accommodate CoreOS, where 'etcd' is a very old version
This commit is contained in:
Bryan Boreham 2016-08-04 14:36:25 +01:00 committed by Bryan Boreham
parent dbc59aad7c
commit 1307799a66
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/e2e_service.go
View File

@ -181,7 +181,12 @@ func (es *e2eService) startEtcd() (*killCmd, error) {
return nil, err return nil, err
} }
es.etcdDataDir = dataDir es.etcdDataDir = dataDir
etcdPath, err := exec.LookPath("etcd") var etcdPath string
// CoreOS ships a binary named 'etcd' which is really old, so prefer 'etcd2' if it exists
etcdPath, err = exec.LookPath("etcd2")
if err != nil {
etcdPath, err = exec.LookPath("etcd")
}
if err != nil { if err != nil {
glog.Infof("etcd not found in PATH. Defaulting to %s...", defaultEtcdPath) glog.Infof("etcd not found in PATH. Defaulting to %s...", defaultEtcdPath)
_, err = os.Stat(defaultEtcdPath) _, err = os.Stat(defaultEtcdPath)