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

Merge pull request #27597 from dchen1107/kubectl

Browse Source 
Automatic merge from submit-queue

No timeout for kubectl logs

Fix #27588

cc/ @smarterclayton
This commit is contained in:
k8s-merge-robot 2016-06-17 17:48:15 -07:00 committed by GitHub
commit 04fd079d09
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,12 +336,8 @@ func (d *kubeDockerClient) RemoveImage(image string, opts dockertypes.ImageRemov
} }
func (d *kubeDockerClient) Logs(id string, opts dockertypes.ContainerLogsOptions, sopts StreamOptions) error { func (d *kubeDockerClient) Logs(id string, opts dockertypes.ContainerLogsOptions, sopts StreamOptions) error {
ctx, cancel := getDefaultContext() // Don't set timeout for log calls
defer cancel() resp, err := d.client.ContainerLogs(context.Background(), id, opts)
resp, err := d.client.ContainerLogs(ctx, id, opts)
if ctxErr := contextError(ctx); ctxErr != nil {
return ctxErr
}
if err != nil { if err != nil {
return err return err
} }