github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3462 from dchen1107/cleanup

Browse Source 
Fix Event.Source for hostname_override case.
This commit is contained in:
Daniel Smith 2015-01-14 11:21:24 -08:00
commit 5b7369720d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/util.go
View File

@ -82,9 +82,8 @@ func SetupLogging() {
record.StartLogging(glog.Infof) record.StartLogging(glog.Infof)
} }
func SetupEventSending(client *client.Client) { func SetupEventSending(client *client.Client, hostname string) {
glog.Infof("Sending events to api server.") glog.Infof("Sending events to api server.")
hostname := util.GetHostname("")
record.StartRecording(client.Events(""), record.StartRecording(client.Events(""),
api.EventSource{ api.EventSource{
Component: "kubelet", Component: "kubelet",

5
pkg/standalone/standalone.go
View File

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