From 0716df8f2b85af91bf2cbe5ec471b935567296e2 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Wed, 14 Jan 2015 09:36:09 -0800 Subject: [PATCH] Fix Event.Source for hostname_override case. --- pkg/kubelet/util.go | 3 +-- pkg/standalone/standalone.go | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/util.go b/pkg/kubelet/util.go index 117969481bc..767108c9bf5 100644 --- a/pkg/kubelet/util.go +++ b/pkg/kubelet/util.go @@ -82,9 +82,8 @@ func SetupLogging() { record.StartLogging(glog.Infof) } -func SetupEventSending(client *client.Client) { +func SetupEventSending(client *client.Client, hostname string) { glog.Infof("Sending events to api server.") - hostname := util.GetHostname("") record.StartRecording(client.Events(""), api.EventSource{ Component: "kubelet", diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index fa8e740d815..2e42a4b6174 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -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 {