github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14169 from mesosphere/sttts-fix-kubelet-writer-npe

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-21 13:04:25 -07:00
commit 3713cbc912
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/executor/service/service.go
View File

@ -44,6 +44,7 @@ import (
kconfig "k8s.io/kubernetes/pkg/kubelet/config" kconfig "k8s.io/kubernetes/pkg/kubelet/config"
"k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
utilio "k8s.io/kubernetes/pkg/util/io"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/oom"
@ -168,11 +169,13 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
mounter = &mount.NsenterMounter{} mounter = &mount.NsenterMounter{}
} }
var writer utilio.Writer = &utilio.StdWriter{}
var dockerExecHandler dockertools.ExecHandler var dockerExecHandler dockertools.ExecHandler
switch s.DockerExecHandlerName { switch s.DockerExecHandlerName {
case "native": case "native":
dockerExecHandler = &dockertools.NativeExecHandler{} dockerExecHandler = &dockertools.NativeExecHandler{}
case "nsenter": case "nsenter":
writer = &utilio.NsenterWriter{}
dockerExecHandler = &dockertools.NsenterExecHandler{} dockerExecHandler = &dockertools.NsenterExecHandler{}
default: default:
log.Warningf("Unknown Docker exec handler %q; defaulting to native", s.DockerExecHandlerName) 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, DockerExecHandler: dockerExecHandler,
ResolverConfig: s.ResolverConfig, ResolverConfig: s.ResolverConfig,
CPUCFSQuota: s.CPUCFSQuota, CPUCFSQuota: s.CPUCFSQuota,
Writer: writer,
} }
kcfg.NodeName = kcfg.Hostname kcfg.NodeName = kcfg.Hostname