Skip to content

Commit

Permalink
Merge pull request #58074 from jsravn/automated-cherry-pick-of-#56967…
Browse files Browse the repository at this point in the history
…-upstream-release-1.8

Automatic merge from submit-queue.

Cherry pick of #56967 to release-1.8

**What this PR does / why we need it**:
Adds timeout around docker queries, to prevent wedging kubelet on node status updates if docker is non-responsive.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #53207
Cherry picks #56967

**Special notes for your reviewer**:
Kubelet's node status update queries cadvisor, which had no timeout on underlying docker queries. As a result, if docker was non responsive, kubelet would never be able to recover itself without a restart.

**Release note**:

```release-note
Timeout docker queries to prevent node going NotReady indefinitely.
```
  • Loading branch information
Kubernetes Submit Queue authored Mar 31, 2018
2 parents 7162c40 + 6bfc486 commit ec7b27e
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 116 deletions.
164 changes: 82 additions & 82 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ec7b27e

Please sign in to comment.