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

Check the error before parsing the apiversion #44047

Merged
merged 1 commit into from
Apr 4, 2017
Merged

Check the error before parsing the apiversion #44047

merged 1 commit into from
Apr 4, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Apr 4, 2017 •
edited by enisoc
Loading

This fixes #44027

Fix [Kubelet panic when Docker is not running](https://github.com/kubernetes/kubernetes/issues/44027).

@yujuhong yujuhong added kind/bug Categorizes issue or PR as related to a bug. sig/node Categorizes an issue or PR as relevant to SIG Node. labels Apr 4, 2017
@yujuhong yujuhong added this to the v1.6 milestone Apr 4, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 4, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 4, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@yujuhong yujuhong mentioned this pull request Apr 4, 2017
Closed
@yujuhong yujuhong added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherrypick-candidate and removed release-note-label-needed labels Apr 4, 2017
@Random-Liu
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, yujuhong

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 44047, 43514, 44037, 43467)

@k8s-github-robot k8s-github-robot merged commit 1a43fd0 into kubernetes:master Apr 4, 2017
@k8s-github-robot
Copy link

@yujuhong PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 4, 2017
@yujuhong yujuhong mentioned this pull request Apr 4, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Apr 4, 2017
Merge pull request #44060 from yujuhong/automated-cherry-pick-of-#440…
e458159 
…47-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #44047

Cherry pick of #44047 on release-1.6.

#44047: Check the error before parsing the apiversion

```release-note
Fix [Kubelet panic when Docker is not running](#44027).
```
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@enisoc enisoc added release-note-none Denotes a PR that doesn't merit a release note. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. release-note-none Denotes a PR that doesn't merit a release note. labels Apr 13, 2017
@yujuhong yujuhong deleted the dont_panic branch May 19, 2017 16:56
mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
Merge pull request kubernetes#44060 from yujuhong/automated-cherry-pi…
3709705 
…ck-of-#44047-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#44047

Cherry pick of kubernetes#44047 on release-1.6.

kubernetes#44047: Check the error before parsing the apiversion

```release-note
Fix [Kubelet panic when Docker is not running](kubernetes#44027).
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Random-Liu Random-Liu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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.6
Development

Successfully merging this pull request may close these issues.

Kubelet segfaults when Docker is not running
7 participants
@yujuhong @k8s-reviewable @Random-Liu @k8s-github-robot @k8s-cherrypick-bot @enisoc @k8s-ci-robot