docker: don't set timeout for image pulling requests

2016-05-23 16:13:26 -07:00
parent 4215fe57a5
commit 77dba962db
1 changed files with 3 additions and 6 deletions
--- 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
 	}