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

NodeName != HostName: Fixes for contrib/mesos

Browse Source
This commit is contained in:
Justin Santa Barbara 2015-06-16 10:32:53 -04:00
parent c89b0cd807
commit 77e1bd3f56
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/mesos/pkg/executor/service/service.go
View File

@ -259,6 +259,8 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
DockerExecHandler: dockerExecHandler, DockerExecHandler: dockerExecHandler,
} }
kcfg.NodeName = kcfg.Hostname
err = app.RunKubelet(&kcfg, app.KubeletBuilder(func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) { err = app.RunKubelet(&kcfg, app.KubeletBuilder(func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) {
return s.createAndInitKubelet(kc, hks, clientConfig, shutdownCloser) return s.createAndInitKubelet(kc, hks, clientConfig, shutdownCloser)
})) }))
@ -319,6 +321,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
klet, err := kubelet.NewMainKubelet( klet, err := kubelet.NewMainKubelet(
kc.Hostname, kc.Hostname,
kc.NodeName,
kc.DockerClient, kc.DockerClient,
kubeClient, kubeClient,
kc.RootDirectory, kc.RootDirectory,