k8sm patches for recent commits to upstream/master:

contrib/mesos/pkg/controllermanager/controllermanager.go

@@ -197,7 +197,7 @@ func (s *CMServer) Run(_ []string) error {
 	}
 
 	namespaceController := namespacecontroller.NewNamespaceController(clientset.NewForConfigOrDie(client.AddUserAgent(kubeconfig, "namespace-controller")), versions, s.NamespaceSyncPeriod)
-	namespaceController.Run(s.ConcurrentNamespaceSyncs, wait.NeverStop)
+	go namespaceController.Run(s.ConcurrentNamespaceSyncs, wait.NeverStop)
 
 	groupVersion := "extensions/v1beta1"
 	resources, found := resourceMap[groupVersion]

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

@@ -253,6 +253,7 @@ func (s *KubeletExecutorServer) runKubelet(
 	//       initialize the cloud provider. We explicitly wouldn't want
 	//       that because then every kubelet instance would query the master
 	//       state.json which does not scale.
+	s.KubeletServer.LockFilePath = "" // disable lock file
 	err = kubeletapp.Run(s.KubeletServer, kcfg)
 	return
 }