Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64780 from luxas/kubeadm_new_dropins
Automatic merge from submit-queue (batch tested with PRs 64009, 64780, 64354, 64727, 63650). 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: Update the dropin for the kubelet in v1.11 **What this PR does / why we need it**: One of the final pieces of kubernetes/kubeadm#851, kubernetes/kubeadm#847 and kubernetes/kubeadm#822 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: (partially) Fixes kubernetes/kubeadm#822 **Special notes for your reviewer**: Please check whether this release note makes sense to you. **Release note**: ```release-note [action required] The structure of the kubelet dropin in the kubeadm deb package has changed significantly. Instead of hard-coding the parameters for the kubelet in the dropin, a structured configuration file for the kubelet is used, and is expected to be present in `/var/lib/kubelet/config.yaml`. For runtime-detected, instance-specific configuration values, a environment file with dynamically-generated flags at `kubeadm init` or `kubeadm join` run time is used. Finally, if the user wants to override something specific for the kubelet that can't be done via the kubeadm Configuration file (which is preferred), they might add flags to the `KUBELET_EXTRA_ARGS` environment variable in either `/etc/default/kubelet` or `/etc/sysconfig/kubelet`, depending on the system you're running on. ``` @kubernetes/sig-cluster-lifecycle-pr-reviews
- Loading branch information