mirror of
https://github.com/outbackdingo/kubernetes.git
synced 2026-02-26 12:50:35 +00:00
a90e43ca32
Automatic merge from submit-queue (batch tested with PRs 59292, 59600). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add criSocket to kubeadm NodeConfiguration manifest **What this PR does / why we need it**: Adds a criSocket field to the NodeConfiguration manifest used by kubeadm. This field configures the cri socket that kubeadm uses during preflight checks. **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#679 **Special notes for your reviewer**: This is a follow up PR, as requested, to https://github.com/kubernetes/kubernetes/pull/59057. The NodeConfiguration manifest now has a criSocket field that can be used when using the config manifest to join a node to the cluster. **Release note**: /area kubeadm /assign @luxas /cc @kubernetes/sig-cluster-lifecycle-pr-reviews ```release-note kubeadm: add criSocket field to NodeConfiguration manifiest ```