Fix Event.Source for hostname_override case.

This commit is contained in:
Dawn Chen
2015-01-14 09:36:09 -08:00
parent 1f210d4961
commit 0716df8f2b
2 changed files with 3 additions and 5 deletions

View File

@@ -170,16 +170,15 @@ func SimpleRunKubelet(client *client.Client, etcdClient tools.EtcdClient, docker
// 3 Standalone 'kubernetes' binary
// Eventually, #2 will be replaced with instances of #3
func RunKubelet(kcfg *KubeletConfig) {
kcfg.Hostname = util.GetHostname(kcfg.HostnameOverride)
if kcfg.KubeClient != nil {
kubelet.SetupEventSending(kcfg.KubeClient)
kubelet.SetupEventSending(kcfg.KubeClient, kcfg.Hostname)
} else {
glog.Infof("No api server defined - no events will be sent.")
}
kubelet.SetupLogging()
kubelet.SetupCapabilities(kcfg.AllowPrivileged)
kcfg.Hostname = util.GetHostname(kcfg.HostnameOverride)
cfg := makePodSourceConfig(kcfg)
k, err := createAndInitKubelet(kcfg, cfg)
if err != nil {