From da9db0b0c4ff9ea52c3cde967231f5880b415a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vorburger=20=E2=9B=91=EF=B8=8F?= Date: Tue, 6 Aug 2019 02:09:54 +0200 Subject: [PATCH] porting some information from kubeadm-init.md to kubelet-integration.md (#15423) * porting some information from kubeadm-init.md to kubelet-integration.md doc from reference/setup-tools/kubeadm/kubeadm-init.md to setup/production-environment/tools/kubeadm/kubelet-integration.md includes edits I just proposed in #15421 and #80136 * improve wording re. systemd in kubelet-integration.md * removing quotes and adding the in kubelet-integration.md * Update content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md Co-Authored-By: Lubomir I. Ivanov --- .../tools/kubeadm/kubelet-integration.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md index f3ca59d898..ef9b958a7e 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md @@ -157,15 +157,19 @@ has finished performing the TLS Bootstrap. ## The kubelet drop-in file for systemd -The configuration file installed by the kubeadm DEB or RPM package is written to +kubeadm ships with configuration for how systemd should run the kubelet. +Note that the kubeadm CLI command never touches this drop-in file. + +This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/kubernetes/blob/master/build/debs/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/kubernetes/blob/master/build/rpms/10-kubeadm.conf) is written to `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` and is used by systemd. +It augments the basic [`kubelet.service` for RPM](https://github.com/kubernetes/kubernetes/blob/master/build/rpms/kubelet.service) (resp. [`kubelet.service` for DEB](https://github.com/kubernetes/kubernetes/blob/master/build/debs/kubelet.service))): ```none [Service] Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml" -# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating +# This is a file that "kubeadm init" and "kubeadm join" generate at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env # This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably,