From 4b16e979e6bde559a64325268d066a18bf06ba12 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 4 Nov 2014 16:58:37 -0800 Subject: [PATCH] Fix nil docker client (how did this ever work???) --- pkg/kubelet/dockertools/docker.go | 4 ++-- pkg/kubelet/kubelet.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index 5169aa29a73..cbff15f8114 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -207,8 +207,8 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd [] // NewDockerContainerCommandRunner creates a ContainerCommandRunner which uses nsinit to run a command // inside a container. -func NewDockerContainerCommandRunner() ContainerCommandRunner { - return &dockerContainerCommandRunner{} +func NewDockerContainerCommandRunner(client DockerInterface) ContainerCommandRunner { + return &dockerContainerCommandRunner{client: client} } func (p dockerPuller) Pull(image string) error { diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 65d444c8126..027cce18688 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -73,7 +73,7 @@ func NewMainKubelet( resyncInterval: ri, networkContainerImage: ni, podWorkers: newPodWorkers(), - runner: dockertools.NewDockerContainerCommandRunner(), + runner: dockertools.NewDockerContainerCommandRunner(dc), httpClient: &http.Client{}, pullQPS: pullQPS, pullBurst: pullBurst,