From 77e1bd3f56fea95a128bd3d9fe02fa78e9c6492c Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 16 Jun 2015 10:32:53 -0400
Subject: [PATCH] NodeName != HostName: Fixes for contrib/mesos

---
 contrib/mesos/pkg/executor/service/service.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go
index ad738fd8a24..dd3b6605b9e 100644
--- a/contrib/mesos/pkg/executor/service/service.go
+++ b/contrib/mesos/pkg/executor/service/service.go
@@ -259,6 +259,8 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
 		DockerExecHandler:         dockerExecHandler,
 	}
 
+	kcfg.NodeName = kcfg.Hostname
+
 	err = app.RunKubelet(&kcfg, app.KubeletBuilder(func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) {
 		return s.createAndInitKubelet(kc, hks, clientConfig, shutdownCloser)
 	}))
@@ -319,6 +321,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
 
 	klet, err := kubelet.NewMainKubelet(
 		kc.Hostname,
+		kc.NodeName,
 		kc.DockerClient,
 		kubeClient,
 		kc.RootDirectory,