Merge pull request #6940 from roberthbailey/dead-kubelet-code

Remove an unused function in the kubelet code.
This commit is contained in:
Dawn Chen 2015-04-16 16:51:21 -07:00
commit e1b0320729

View File

@ -317,20 +317,6 @@ func (s *KubeletServer) Run(_ []string) error {
}
func (s *KubeletServer) setupRunOnce() {
if s.RunOnce {
// Don't use apiserver source, on the presumption that this flag is used
// for bootstrapping some system pods.
if len(s.APIServerList) > 0 {
glog.Fatalf("invalid option: --runonce and --api_servers are mutually exclusive")
}
if s.EnableServer {
glog.Infof("--runonce is set, disabling server")
s.EnableServer = false
}
}
}
// TODO: replace this with clientcmd
func (s *KubeletServer) createAPIServerClient() (*client.Client, error) {
authInfo, err := clientauth.LoadFromFile(s.AuthPath)