-
Notifications
You must be signed in to change notification settings - Fork 38.9k
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.
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
kubeadm preflight: check CRI socket path if defined or docker service otherwise #62481
Conversation
/assign @timothysc |
I'll do a pass, but I would also like feedback from /cc @runcom |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks ok to me, thanks for taking this one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
Thinking about this a little more, I am currently checking if the socket is defined at all, which it will always be since it will take the default of |
@timothysc and @runcom I added some additional deduplication of the checks that were common for both the |
/retest |
@taharah: you can't request testing unless you are a kubernetes member. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/ok-to-test |
Hi @timothysc , I notice that you manually removed |
@timothysc or @xiangpengzhao this PR should be good to be merged now. |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kargakis, taharah, timothysc The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/retest |
Automatic merge from submit-queue (batch tested with PRs 62481, 62643, 61877, 62515). If you want to cherry-pick this change to another branch, please follow the instructions here. |
What this PR does / why we need it:
Currently, running
kubeadm init
without Docker installed will cause theService-Docker
preflight check to fail even when another CRI is installed and the CRI socket specified. This changes the preflight checks to check the CRI socket if specified, and falling back to checking the Docker service otherwise. Additionally, this deduplicates common checks betweenkubeadm init
andkubeadm join
to ensure that similar preflight checks stay in-sync going forward.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 # kubernetes/kubeadm#657 - it still has the same behavior on joins
Fixes # kubernetes/kubeadm#749 - will check the CRI socket if specified and skip the Docker service check
Special notes for your reviewer:
Release note: