Skip to content

Commit 4f7477c

Browse files
authored
Merge pull request #20778 from prasadkatti/kubelet_integration_doc
Update kubeadm-kubelet integration doc
2 parents 0f91086 + 20187db commit 4f7477c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ The lifecycle of the kubeadm CLI tool is decoupled from the
1515
on each node within the Kubernetes cluster. The kubeadm CLI tool is executed by the user when Kubernetes is
1616
initialized or upgraded, whereas the kubelet is always running in the background.
1717

18-
Since the kubelet is a daemon, it needs to be maintained by some kind of a init
18+
Since the kubelet is a daemon, it needs to be maintained by some kind of an init
1919
system or service manager. When the kubelet is installed using DEBs or RPMs,
2020
systemd is configured to manage the kubelet. You can use a different service
2121
manager instead, but you need to configure it manually.
2222

2323
Some kubelet configuration details need to be the same across all kubelets involved in the cluster, while
24-
other configuration aspects need to be set on a per-kubelet basis, to accommodate the different
25-
characteristics of a given machine, such as OS, storage, and networking. You can manage the configuration
26-
of your kubelets manually, but [kubeadm now provides a `KubeletConfiguration` API type for managing your
24+
other configuration aspects need to be set on a per-kubelet basis to accommodate the different
25+
characteristics of a given machine (such as OS, storage, and networking). You can manage the configuration
26+
of your kubelets manually, but kubeadm now provides a `KubeletConfiguration` API type for [managing your
2727
kubelet configurations centrally](#configure-kubelets-using-kubeadm).
2828

2929
{{% /capture %}}
@@ -67,7 +67,7 @@ For more details on the ComponentConfig have a look at [this section](#configure
6767
6868
### Providing instance-specific configuration details
6969
70-
Some hosts require specific kubelet configurations, due to differences in hardware, operating system,
70+
Some hosts require specific kubelet configurations due to differences in hardware, operating system,
7171
networking, or other host-specific parameters. The following list provides a few examples.
7272
7373
- The path to the DNS resolution file, as specified by the `--resolv-conf` kubelet
@@ -79,7 +79,7 @@ networking, or other host-specific parameters. The following list provides a few
7979
unless you are using a cloud provider. You can use the `--hostname-override` flag to override the
8080
default behavior if you need to specify a Node name different from the machine's hostname.
8181

82-
- Currently, the kubelet cannot automatically detects the cgroup driver used by the CRI runtime,
82+
- Currently, the kubelet cannot automatically detect the cgroup driver used by the CRI runtime,
8383
but the value of `--cgroup-driver` must match the cgroup driver used by the CRI runtime to ensure
8484
the health of the kubelet.
8585

@@ -107,7 +107,7 @@ for more information on the individual fields.
107107

108108
When you call `kubeadm init`, the kubelet configuration is marshalled to disk
109109
at `/var/lib/kubelet/config.yaml`, and also uploaded to a ConfigMap in the cluster. The ConfigMap
110-
is named `kubelet-config-1.X`, where `.X` is the minor version of the Kubernetes version you are
110+
is named `kubelet-config-1.X`, where `X` is the minor version of the Kubernetes version you are
111111
initializing. A kubelet configuration file is also written to `/etc/kubernetes/kubelet.conf` with the
112112
baseline cluster-wide configuration for all kubelets in the cluster. This configuration file
113113
points to the client certificates that allow the kubelet to communicate with the API server. This
@@ -157,12 +157,12 @@ has finished performing the TLS Bootstrap.
157157

158158
## The kubelet drop-in file for systemd
159159

160-
kubeadm ships with configuration for how systemd should run the kubelet.
160+
`kubeadm` ships with configuration for how systemd should run the kubelet.
161161
Note that the kubeadm CLI command never touches this drop-in file.
162162

163-
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
163+
This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubeadm/10-kubeadm.conf) is written to
164164
`/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` and is used by systemd.
165-
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))):
165+
It augments the basic [`kubelet.service` for RPM](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubelet/kubelet.service) or [`kubelet.service` for DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service):
166166

167167
```none
168168
[Service]

0 commit comments

Comments
 (0)