Automated cherry pick of #37865 #41569 #41610
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If docker hangs, we don't want kubelet to get killed as well.
|
This change is |
k8s-ci-robot
added
the
cncf-cla: yes
k8s-github-robot
added
approved
yujuhong
added
release-note
|
@dchen1107 ping! |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dchen1107, yujuhong
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
|
@saad-ali, could you approve the cherry-pick request? |
|
@k8s-bot gce etcd3 e2e test this |
|
@k8s-bot node e2e test this |
|
@k8s-bot node e2e test this |
mwielgus
added
cherry-pick-approved
yujuhong
removed
the
do-not-merge
|
Automatic merge from submit-queue |
|
Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked. |
yujuhong
deleted the
automated-cherry-pick-of-#37865-#41569-upstream-release-1.5
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick of #37865 #41569 on release-1.5.
#37865: kubelet: remove the pleg health check from healthz/
#41569: Report node not ready on failed PLEG health check