From 9d8d0ed0751a50bcd0318c5ee1e5908bc474db1e Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 18 Sep 2015 13:50:53 +0200 Subject: [PATCH] Fix missing volume writer in executor kubelet instantiation --- contrib/mesos/pkg/executor/service/service.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 1f81210ef37..5037a7f661e 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -44,6 +44,7 @@ import ( kconfig "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" + utilio "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/oom" @@ -168,11 +169,13 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error { mounter = &mount.NsenterMounter{} } + var writer utilio.Writer = &utilio.StdWriter{} var dockerExecHandler dockertools.ExecHandler switch s.DockerExecHandlerName { case "native": dockerExecHandler = &dockertools.NativeExecHandler{} case "nsenter": + writer = &utilio.NsenterWriter{} dockerExecHandler = &dockertools.NsenterExecHandler{} default: log.Warningf("Unknown Docker exec handler %q; defaulting to native", s.DockerExecHandlerName) @@ -229,6 +232,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error { DockerExecHandler: dockerExecHandler, ResolverConfig: s.ResolverConfig, CPUCFSQuota: s.CPUCFSQuota, + Writer: writer, } kcfg.NodeName = kcfg.Hostname