-
Notifications
You must be signed in to change notification settings - Fork 39.4k
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: perform dockershim cleanup for 1.25 #110022
kubeadm: perform dockershim cleanup for 1.25 #110022
Conversation
Given kubeadm 1.25 only supports kubelet 1.25 and 1.24, 1.23 related logic around dockershim can be removed. - Don't clean the directories /var/lib/dockershim, /var/runkubernetes, /var/lib/cni - Pass the CRISocket directly to the kubelet --container-runtime-endpoint flag without extra handling of dockershim - No longer apply the --container-runtime=remote flag as that is the only possible value in 1.24 and 1.25 - Update unit tests Note: we are still passing --pod-infra-container-image to avoid the pause image to be GCed by the kubelet.
/triage accepted |
kubernetes/cmd/kubeadm/app/util/runtime/runtime.go Lines 31 to 35 in de88dfc
Should the CRISocketDocker constant be removed and should we remove it from the default-known array?
|
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
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123, pacoxu 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 |
It has the cri-dockerd socket so we should keep it, also keep it as part of autodetection:
|
Got it. |
looks like this PR broke: problem appears to be that we are testing kubeadm at master (1.25) against a 1.23 kubelet.
https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/ i guess, what we can do is bring the flag --container-runtime=remote back in kubeadm 1.25 and remove it in 1.26 or later. maybe when it's removed from the kubelet (as it's currently deprecated). |
/kind cleanup
What this PR does / why we need it:
Given kubeadm 1.25 only supports kubelet 1.25 and 1.24,
1.23 related logic around dockershim can be removed.
/var/lib/dockershim, /var/runkubernetes, /var/lib/cni
--container-runtime-endpoint flag without extra handling
of dockershim
as that is the only possible value in 1.24 and 1.25
Note: we are still passing --pod-infra-container-image
to avoid the pause image to be GCed by the kubelet.
#106893
Which issue(s) this PR fixes:
xref kubernetes/kubeadm#2626
Special notes for your reviewer:
NONE
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: