Skip to content

Commit 4b16e97

Browse files
committed
Fix nil docker client (how did this ever work???)
1 parent 652a0ce commit 4b16e97

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/kubelet/dockertools/docker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd []
207207

208208
// NewDockerContainerCommandRunner creates a ContainerCommandRunner which uses nsinit to run a command
209209
// inside a container.
210-
func NewDockerContainerCommandRunner() ContainerCommandRunner {
211-
return &dockerContainerCommandRunner{}
210+
func NewDockerContainerCommandRunner(client DockerInterface) ContainerCommandRunner {
211+
return &dockerContainerCommandRunner{client: client}
212212
}
213213

214214
func (p dockerPuller) Pull(image string) error {

pkg/kubelet/kubelet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func NewMainKubelet(
7373
resyncInterval: ri,
7474
networkContainerImage: ni,
7575
podWorkers: newPodWorkers(),
76-
runner: dockertools.NewDockerContainerCommandRunner(),
76+
runner: dockertools.NewDockerContainerCommandRunner(dc),
7777
httpClient: &http.Client{},
7878
pullQPS: pullQPS,
7979
pullBurst: pullBurst,

0 commit comments

Comments
 (0)