Skip to content

Commit d931086

Browse files
committed
[zh] Sync kubeadm/kubelet-integration.md
Signed-off-by: xin.li <[email protected]>
1 parent 7c09c7b commit d931086

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ by the kubelet, using the `--cluster-dns` flag. This setting needs to be the sam
7878
on every manager and Node in the cluster. The kubelet provides a versioned, structured API object
7979
that can configure most parameters in the kubelet and push out this configuration to each running
8080
kubelet in the cluster. This object is called
81-
[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/).
81+
[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/).
8282
The `KubeletConfiguration` allows the user to specify flags such as the cluster DNS IP addresses expressed as
8383
a list of values to a camelCased key, illustrated by the following example:
8484
@@ -186,7 +186,7 @@ for more information on the individual fields.
186186
通过调用 `kubeadm config print init-defaults --component-configs KubeletConfiguration`,
187187
你可以看到此结构中的所有默认值。
188188

189-
也可以阅读 [KubeletConfiguration 参考](/docs/reference/config-api/kubelet-config.v1beta1/)
189+
也可以阅读 [KubeletConfiguration 参考](/zh/docs/reference/config-api/kubelet-config.v1beta1/)
190190
来获取有关各个字段的更多信息。
191191

192192
<!--
@@ -308,10 +308,15 @@ It augments the basic
308308
[`kubelet.service` for RPM](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubelet/kubelet.service) or
309309
[`kubelet.service` for DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service):
310310

311+
{{< note >}}
312+
The contents below are just an example. If you don't want to use a package manager
313+
follow the guide outlined in the [Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2))
314+
section.
315+
{{< /note >}}
316+
311317
```none
312318
[Service]
313-
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf
314-
--kubeconfig=/etc/kubernetes/kubelet.conf"
319+
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
315320
Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
316321
# This is a file that "kubeadm init" and "kubeadm join" generate at runtime, populating
317322
the KUBELET_KUBEADM_ARGS variable dynamically
@@ -347,10 +352,15 @@ This file specifies the default locations for all of the files managed by kubead
347352
或者 [DEB 版本 `kubelet.service`](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service)
348353
作了增强:
349354

355+
{{< note >}}
356+
下面的内容只是一个例子。 如果您不想使用包管理器,
357+
请遵循[没有包管理器](/zh/docs/setup/productionenvironment/tools/kubeadm/install-kubeadm/#k8s-install-2))
358+
部分中叙述的指南。
359+
{{< /note >}}
360+
350361
```none
351362
[Service]
352-
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf
353-
--kubeconfig=/etc/kubernetes/kubelet.conf"
363+
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
354364
Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
355365
# 这是 "kubeadm init" 和 "kubeadm join" 运行时生成的文件,动态地填充 KUBELET_KUBEADM_ARGS 变量
356366
EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
@@ -381,9 +391,10 @@ The DEB and RPM packages shipped with the Kubernetes releases are:
381391
| Package name | Description |
382392
|----------------|-------------|
383393
| `kubeadm` | Installs the `/usr/bin/kubeadm` CLI tool and the [kubelet drop-in file](#the-kubelet-drop-in-file-for-systemd) for the kubelet. |
384-
| `kubelet` | Installs the kubelet binary in `/usr/bin` and CNI binaries in `/opt/cni/bin`. |
394+
| `kubelet` | Installs the `/usr/bin/kubelet` binary. |
385395
| `kubectl` | Installs the `/usr/bin/kubectl` binary. |
386396
| `cri-tools` | Installs the `/usr/bin/crictl` binary from the [cri-tools git repository](https://github.com/kubernetes-sigs/cri-tools). |
397+
| `kubernetes-cni` | Installs the `/opt/cni/bin` binaries from the [plugins git repository](https://github.com/containernetworking/plugins). |
387398
-->
388399
## Kubernetes 可执行文件和软件包内容
389400

@@ -392,7 +403,8 @@ Kubernetes 版本对应的 DEB 和 RPM 软件包是:
392403
| Package name | Description |
393404
|--------------|-------------|
394405
| `kubeadm` | 给 kubelet 安装 `/usr/bin/kubeadm` CLI 工具和 [kubelet 的 systemd 文件](#the-kubelet-drop-in-file-for-systemd)。 |
395-
| `kubelet` | 安装 kubelet 可执行文件到 `/usr/bin` 路径,安装 CNI 可执行文件到 `/opt/cni/bin` 路径。 |
406+
| `kubelet` | 安装 `/usr/bin/kubelet` 可执行文件。 |
396407
| `kubectl` | 安装 `/usr/bin/kubectl` 可执行文件。 |
397408
| `cri-tools` | 从 [cri-tools git 仓库](https://github.com/kubernetes-sigs/cri-tools)中安装 `/usr/bin/crictl` 可执行文件。 |
409+
| `kubernetes-cni` | 从 [plugins git 仓库](https://github.com/containernetworking/plugins)中安装 `/opt/cni/bin` 可执行文件。|
398410

0 commit comments

Comments
 (0)