Revert "Allow nodename to be != hostname, use AWS instance ID on AWS"

contrib/mesos/pkg/executor/service/service.go

@@ -259,8 +259,6 @@ 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)
 	}))
@@ -321,7 +319,6 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
 
 	klet, err := kubelet.NewMainKubelet(
 		kc.Hostname,
-		kc.NodeName,
 		kc.DockerClient,
 		kubeClient,
 		kc.RootDirectory,