Skip to content

Commit 26f6a21

Browse files
committed
kubeadm: remove mentions of the the legacy kubelet-config-x.yy
The default kubelet configuration ConfigMap that kubeadm manages is "kubelet-config" instead of "kubelet-config-x.yy" (where x.yy is the Kubernetes version) in 1.24. Cleanup references to the legacy naming in kubeadm documentation. Generated contents in content/en/docs/reference/* are not updated.
1 parent 31a1f5b commit 26f6a21

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@ for more information on the individual fields.
103103
### Workflow when using `kubeadm init`
104104

105105
When you call `kubeadm init`, the kubelet configuration is marshalled to disk
106-
at `/var/lib/kubelet/config.yaml`, and also uploaded to a ConfigMap in the cluster. The ConfigMap
107-
is named `kubelet-config-1.X`, where `X` is the minor version of the Kubernetes version you are
108-
initializing. A kubelet configuration file is also written to `/etc/kubernetes/kubelet.conf` with the
109-
baseline cluster-wide configuration for all kubelets in the cluster. This configuration file
106+
at `/var/lib/kubelet/config.yaml`, and also uploaded to a `kubelet-config` ConfigMap in the `kube-system`
107+
namespace of the cluster. A kubelet configuration file is also written to `/etc/kubernetes/kubelet.conf`
108+
with the baseline cluster-wide configuration for all kubelets in the cluster. This configuration file
110109
points to the client certificates that allow the kubelet to communicate with the API server. This
111110
addresses the need to
112111
[propagate cluster-level configuration to each kubelet](#propagating-cluster-level-configuration-to-each-kubelet).
@@ -137,7 +136,7 @@ If the reload and restart are successful, the normal `kubeadm init` workflow con
137136

138137
When you run `kubeadm join`, kubeadm uses the Bootstrap Token credential to perform
139138
a TLS bootstrap, which fetches the credential needed to download the
140-
`kubelet-config-1.X` ConfigMap and writes it to `/var/lib/kubelet/config.yaml`. The dynamic
139+
`kubelet-config` ConfigMap and writes it to `/var/lib/kubelet/config.yaml`. The dynamic
141140
environment file is generated in exactly the same way as `kubeadm init`.
142141

143142
Next, `kubeadm` runs the following two commands to load the new configuration into the kubelet:

content/en/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ nodes before deleting the old nodes.
9696

9797
### Modify the kubelet ConfigMap
9898

99-
- Find the kubelet ConfigMap name using `kubectl get cm -n kube-system | grep kubelet-config`.
100-
- Call `kubectl edit cm kubelet-config-x.yy -n kube-system` (replace `x.yy` with
101-
the Kubernetes version).
99+
- Call `kubectl edit cm kubelet-config -n kube-system`.
102100
- Either modify the existing `cgroupDriver` value or add a new field that looks like this:
103101

104102
```yaml

0 commit comments

Comments
 (0)