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

Don't check runtime condition for rktnetes #44569

Merged
merged 1 commit into from
Apr 17, 2017
Merged

Don't check runtime condition for rktnetes #44569

merged 1 commit into from
Apr 17, 2017

Conversation

yujuhong
Copy link
Contributor

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

rktnetes is not a CRI implementation, and does not provide runtime
conditions. This change fixes the issue where rkt will never be
considered running from kubelet's point of view.

CRI: Fix kubelet failing to start when using rkt.

@yujuhong yujuhong added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Apr 17, 2017
@yujuhong yujuhong added this to the v1.6 milestone Apr 17, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 17, 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. labels Apr 17, 2017
@yujuhong
Copy link
Contributor Author

/cc @dchen1107 @yifan-gu

@k8s-reviewable
Copy link

This change is Reviewable

@yujuhong
Don't check runtime condition for rktnetes
1d3d12d 
rktnetes is not a CRI implementation, and does not provide runtime
conditions. This change fixes the issue where rkt will never be
considered running from kubelet's point of view.
@yujuhong
Copy link
Contributor Author

ref: http://stackoverflow.com/questions/43447719/kubelet-fails-to-start-with-rocket

@dchen1107
Copy link
Member

/lgtm

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

@enisoc, the release czar for 1.6 patch releases. I am ok to either decision of cherrypick or not since in 1.6, we only announce CRI and docker integration in beta, not rkt.

@k8s-github-robot
Copy link

[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 /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@dchen1107 dchen1107 mentioned this pull request Apr 17, 2017
Open
@yujuhong
Copy link
Contributor Author

@enisoc, the release czar for 1.6 patch releases. I am ok to either decision of cherrypick or not since in 1.6, we only announce CRI and docker integration in beta, not rkt.

Admittedly, we don't have any CI for rktnetes, so I have no idea whether this is the only bug.
But I think we should still cherry-pick this trivial fix. It's a regression and without it, rktnetes surely won't work.

@enisoc
Copy link
Member

enisoc commented Apr 17, 2017

Sounds fine to me. Feel free to create a cherrypick once this merges.

@pnpavlov
Copy link

@yujuhong thank you for reviewing and fixing the issue ( rkt/rkt#3647 ), that I opened . I see your change is in 1.7 (master) and you will down-port (cherry pick) in 1.62, right? Maybe i can give it a go with one of those releases next days to see what else will show up?

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit d3d6950 into kubernetes:master Apr 17, 2017
@yujuhong yujuhong mentioned this pull request Apr 17, 2017
Merged
@yujuhong
Copy link
Contributor Author

@pnpavlov, yes, we'll patch 1.6, so you can wait for the 1.6.2 release to test this :-)

k8s-github-robot pushed a commit that referenced this pull request Apr 17, 2017
Merge pull request #44574 from yujuhong/automated-cherry-pick-of-#445…
38ea22e 
…69-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #44569

Cherry pick of #44569 on release-1.6.

#44569: Don't check runtime condition for rktnetes
@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.

@yujuhong yujuhong deleted the fix-rkt branch May 19, 2017 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@freehan freehan

@Random-Liu Random-Liu

@dchen1107 dchen1107

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
10 participants
@yujuhong @k8s-reviewable @dchen1107 @k8s-github-robot @enisoc @pnpavlov @k8s-cherrypick-bot @freehan @Random-Liu @k8s-ci-robot