github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix nil docker client (how did this ever work???)

Browse Source
This commit is contained in:
Daniel Smith 2014-11-04 16:58:37 -08:00
parent 652a0ce4db
commit 4b16e979e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/docker.go
View File

@ -207,8 +207,8 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd []
// NewDockerContainerCommandRunner creates a ContainerCommandRunner which uses nsinit to run a command // NewDockerContainerCommandRunner creates a ContainerCommandRunner which uses nsinit to run a command
// inside a container. // inside a container.
func NewDockerContainerCommandRunner() ContainerCommandRunner { func NewDockerContainerCommandRunner(client DockerInterface) ContainerCommandRunner {
return &dockerContainerCommandRunner{} return &dockerContainerCommandRunner{client: client}
} }
func (p dockerPuller) Pull(image string) error { func (p dockerPuller) Pull(image string) error {

2
pkg/kubelet/kubelet.go
View File

@ -73,7 +73,7 @@ func NewMainKubelet(
resyncInterval: ri, resyncInterval: ri,
networkContainerImage: ni, networkContainerImage: ni,
podWorkers: newPodWorkers(), podWorkers: newPodWorkers(),
runner: dockertools.NewDockerContainerCommandRunner(), runner: dockertools.NewDockerContainerCommandRunner(dc),
httpClient: &http.Client{}, httpClient: &http.Client{},
pullQPS: pullQPS, pullQPS: pullQPS,
pullBurst: pullBurst, pullBurst: pullBurst,