Skip to content

K
k3s
Commit 73508972 authored by Mike Danese's avatar Mike Danese
Browse files
Options

Merge pull request #26122 from yujuhong/no_timeout

docker: don't set timeout for image pulling requests
parents 6e4f494a 77dba962
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
pkg/kubelet/dockertools/kube_docker_client.go
View file @ 73508972
...@@ -198,13 +198,10 @@ func (d *kubeDockerClient) PullImage(image string, auth dockertypes.AuthConfig, ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment