forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kubeadm: perform dockershim cleanup for 1.25
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.
- Loading branch information
Showing
3 changed files
with
7 additions
and
124 deletions.
There are no files selected for viewing
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
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
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