github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

docker: don't set timeout for image pulling requests

Browse Source
This commit is contained in:
Yu-Ju Hong 2016-05-23 16:13:26 -07:00
parent 4215fe57a5
commit 77dba962db
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/dockertools/kube_docker_client.go
View File

@ -198,13 +198,10 @@ func (d *kubeDockerClient) PullImage(image string, auth dockertypes.AuthConfig,
if err != nil { if err != nil {
return err return err
} }
ctx, cancel := getDefaultContext()
defer cancel()
opts.RegistryAuth = base64Auth opts.RegistryAuth = base64Auth
resp, err := d.client.ImagePull(ctx, image, opts) // Don't set timeout for the context because image pulling can be
if ctxErr := contextError(ctx); ctxErr != nil { // take an arbitrarily long time.
return ctxErr resp, err := d.client.ImagePull(context.Background(), image, opts)
}
if err != nil { if err != nil {
return err return err
} }