mirror of https://github.com/k3s-io/k3s
72e0256935
Automatic merge from submit-queue. 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 MasterConfiguration manifest **What this PR does / why we need it**: Adds a criSocket field to the MasterConfiguration 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**: kubeadm does not allow the use of --config and the --cri-socket flag together. When using kubeadm to create a cluster that will not be using docker, the preflight checks fail since this is not configurable. This PR adds the criSocket to the MasterConfiguration manifest and uses that value within the MasterConfiguration if it was provided. Storing the value of the criSocket within the MasterConfiguration manifest will also make joining additional masters with the proposed 'kubeadm join --master' command by not requiring operators to remember to include an additional flag. This may not be the case if we instead relaxed the constraint of using additional flags when using the --config flag is set. **Release note**: /area kubeadm /assign @luxas /cc @kubernetes/sig-cluster-lifecycle-pr-reviews ```release-note kubeadm: add criSocket field to MasterConfiguration manifiest ``` |
||
|---|---|---|
| .. | ||
| app | ||
| test | ||
| BUILD | ||
| OWNERS | ||
| kubeadm.go | ||