github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

revert change in kubelet

Browse Source
This commit is contained in:
Timothy St. Clair 2015-02-20 11:11:02 -06:00
parent 604df04a9b
commit b37587c17c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/server/server.go
View File

@ -165,9 +165,7 @@ func (s *KubeletServer) Run(_ []string) error {
// //
// TODO(erictune): convert all cloud provider scripts and Google Container Engine to // TODO(erictune): convert all cloud provider scripts and Google Container Engine to
// use only --api_servers, then delete --etcd_servers flag and the resulting dead code. // use only --api_servers, then delete --etcd_servers flag and the resulting dead code.
if len(s.APIServerList) == 0 { if len(s.EtcdServerList) > 0 && len(s.APIServerList) > 0 {
glog.Fatalf("--api_server is required.")
} else if len(s.EtcdServerList) >0 {
glog.Infof("Both --etcd_servers and --api_servers are set. Not using etcd source.") glog.Infof("Both --etcd_servers and --api_servers are set. Not using etcd source.")
s.EtcdServerList = util.StringList{} s.EtcdServerList = util.StringList{}
} }