Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick of #56967 to release-1.8 #58074

Merged
merged 1 commit into from
Mar 31, 2018
Merged

Cherry pick of #56967 to release-1.8 #58074

merged 1 commit into from
Mar 31, 2018

Conversation

jsravn
Copy link
Contributor

@jsravn jsravn commented Jan 10, 2018 •
edited
Loading

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:

Timeout docker queries to prevent node going NotReady indefinitely.

Automated cherry pick of kubernetes#56967
6bfc486 
Update cadvisor dependency to v0.27.4.

Fix kubernetes#53207.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 10, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 10, 2018
This was referenced Jan 10, 2018
Merged
Closed
@dashpole
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 10, 2018
@dashpole
Copy link
Contributor

@jsravn this isn't an automated cherry-pick, right?

@jpbetz jpbetz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jan 11, 2018
@jsravn jsravn changed the title Automated cherry pick of #56967 Cherry pick of #56967 Jan 11, 2018
@jsravn jsravn changed the title Cherry pick of #56967 Cherry pick of #56967 to release-1.8 Jan 11, 2018
@jsravn
Copy link
Contributor Author

jsravn commented Jan 11, 2018

@dashpole Correct, it was done manually. I updated the title.

@jsravn
Copy link
Contributor Author

jsravn commented Jan 11, 2018

/retest

@dashpole
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 11, 2018
@jsravn
Copy link
Contributor Author

jsravn commented Jan 15, 2018

/assign @lavalamp

@jpbetz jpbetz added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: dashpole, jsravn

Associated issue: #53207

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@jpbetz jpbetz removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 16, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 16, 2018
@jpbetz jpbetz added cherrypick-candidate and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jan 16, 2018
@jpbetz
Copy link
Contributor

jpbetz commented Jan 16, 2018

Temporarily removing cherrypick-approved since we're releasing 1.8.7 today. The label will be re-added once 1.8.7 is released.

@k8s-github-robot k8s-github-robot removed this from the v1.8 milestone Mar 4, 2018
@jpbetz jpbetz added cherrypick-candidate and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Mar 5, 2018
@thockin
Copy link
Member

thockin commented Mar 5, 2018

This change is Reviewable

@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Mar 5, 2018
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@jpbetz jpbetz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Mar 12, 2018
@jpbetz
Copy link
Contributor

jpbetz commented Mar 18, 2018

/hold
Hold all unmerged cherrypicks for cut of patch release on Monday.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 18, 2018
@jpbetz jpbetz removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 20, 2018
@jpbetz jpbetz added kind/bug Categorizes issue or PR as related to a bug. sig/node Categorizes an issue or PR as relevant to SIG Node. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Mar 30, 2018
@jpbetz jpbetz added this to the v1.8 milestone Mar 30, 2018
@jpbetz jpbetz removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 30, 2018
@jpbetz
Copy link
Contributor

jpbetz commented Mar 30, 2018

This looks ready, removing hold and adding all required labels for merge.

@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@dashpole @jsravn @lavalamp

Pull Request Labels
  • sig/node: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@BenTheElder
Copy link
Member

/skip

@BenTheElder
Copy link
Member

/test pull-kubernetes-typecheck

@cblecker
Copy link
Member

/retest

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit ec7b27e into kubernetes:release-1.8 Mar 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lavalamp lavalamp

@dashpole dashpole

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.