mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-24 02:15:10 +00:00
c46e8a9248
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>. kubeadm: Let the `--node-name` flag flow down to `--hostname-override` for the kubelet **What this PR does / why we need it**: Kubeadm-initialised kubelet uses provided hostname if present If --node-name is passed in to `kubeadm init`, `--hostname-override` will be passed to kubelet. This prevents timeout errors for `kubeadm init`. **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#846 **Special notes for your reviewer**: Depends on #64624 to work fully, but can safely merged before hand. **Release note**: ```release-note [action required] The `--node-name` flag for kubeadm now dictates the Node API object name the kubelet uses for registration, in all cases but where you might use an in-tree cloud provider. If you're not using an in-tree cloud provider, `--node-name` will set the Node API object name. If you're using an in-tree cloud provider, you MUST make `--node-name` match the name the in-tree cloud provider decides to use. ```