From 62ba692bd9a2cb556f3414ca90f2478fdef217da Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Thu, 11 Feb 2016 06:23:18 +0000 Subject: [PATCH] k8sm patches for recent commits to upstream/master: - run namespace controller async, see see #20076 - do not use a kubelet lock file for k8sm kubelet-executor --- contrib/mesos/pkg/controllermanager/controllermanager.go | 2 +- contrib/mesos/pkg/executor/service/service.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index ffc912885ac..56a00439cf0 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/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] diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 23b1b626936..bf55d04f69b 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/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 }