From 77dba962dba12c54fcd1f236a8e4661fecce2bd8 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 23 May 2016 16:13:26 -0700 Subject: [PATCH] docker: don't set timeout for image pulling requests --- pkg/kubelet/dockertools/kube_docker_client.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/dockertools/kube_docker_client.go b/pkg/kubelet/dockertools/kube_docker_client.go index 6e440b25279..1e911183c2b 100644 --- a/pkg/kubelet/dockertools/kube_docker_client.go +++ b/pkg/kubelet/dockertools/kube_docker_client.go @@ -198,13 +198,10 @@ func (d *kubeDockerClient) PullImage(image string, auth dockertypes.AuthConfig, if err != nil { return err } - ctx, cancel := getDefaultContext() - defer cancel() opts.RegistryAuth = base64Auth - resp, err := d.client.ImagePull(ctx, image, opts) - if ctxErr := contextError(ctx); ctxErr != nil { - return ctxErr - } + // Don't set timeout for the context because image pulling can be + // take an arbitrarily long time. + resp, err := d.client.ImagePull(context.Background(), image, opts) if err != nil { return err }