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

Allow etcd config file to be passed to apiserver, kubelet, and proxy

Browse Source
This commit is contained in:
Haney Maxwell
2014-09-25 18:11:01 -07:00
committed by Haney Maxwell
parent 9c0fafee39
commit 4d87159eda
6 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/master/master.go
View File

@@ -38,7 +38,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
goetcd "github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
)
@@ -69,8 +68,7 @@ type Master struct {
// NewEtcdHelper returns an EtcdHelper for the provided arguments or an error if the version
// is incorrect.
func NewEtcdHelper(etcdServers []string, version string) (helper tools.EtcdHelper, err error) {
client := goetcd.NewClient(etcdServers)
func NewEtcdHelper(client tools.EtcdGetSet, version string) (helper tools.EtcdHelper, err error) {
if version == "" {
version = latest.Version
}