Skip to content

Commit fe39fbe

Browse files
authored
Merge pull request #45623 from Yanping-io/patch1
[zh] sync install-kubeadm and kubelet-integration
2 parents 0cee213 + 5e48f09 commit fe39fbe

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ sudo curl -L --remote-name-all https://dl.k8s.io/release/${RELEASE}/bin/linux/${
515515
sudo chmod +x {kubeadm,kubelet}
516516
517517
RELEASE_VERSION="v0.16.2"
518-
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/krel/templates/latest/kubelet/kubelet.service" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /etc/systemd/system/kubelet.service
519-
sudo mkdir -p /etc/systemd/system/kubelet.service.d
520-
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
518+
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/krel/templates/latest/kubelet/kubelet.service" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /usr/lib/systemd/system/kubelet.service
519+
sudo mkdir -p /usr/lib/systemd/system/kubelet.service.d
520+
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /usr/lib/systemd/system/kubelet.service.d/10-kubeadm.conf
521521
```
522522
523523
{{< note >}}

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,28 @@ This configuration file installed by the `kubeadm`
297297
[package](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf) is written to
298298
`/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` and is used by systemd.
299299
It augments the basic
300-
[`kubelet.service`](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubelet/kubelet.service):
300+
[`kubelet.service`](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubelet/kubelet.service).
301301
-->
302302
通过 `kubeadm` [包](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf)
303-
安装的配置文件被写入 `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf`
303+
安装的配置文件被写入 `/usr/lib/systemd/system/kubelet.service.d/10-kubeadm.conf`
304304
并由 systemd 使用。它对原来的
305-
[`kubelet.service`](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubelet/kubelet.service) 作了增强:
305+
[`kubelet.service`](https://github.com/kubernetes/release/blob/cd53840/cmd/krel/templates/latest/kubelet/kubelet.service) 作了增强。
306+
307+
<!--
308+
If you want to override that further, you can make a directory `/etc/systemd/system/kubelet.service.d/`
309+
(not `/usr/lib/systemd/system/kubelet.service.d/`) and put your own customizations into a file there.
310+
For example, you might add a new local file `/etc/systemd/system/kubelet.service.d/local-overrides.conf`
311+
to override the unit settings configured by `kubeadm`.
312+
313+
Here is what you are likely to find in `/usr/lib/systemd/system/kubelet.service.d/10-kubeadm.conf`:
314+
-->
315+
如果你想进一步覆盖它,可以创建一个目录`/etc/systemd/system/kubelet.service.d/`
316+
(而不是`/usr/lib/systemd/kubelet.service.d/`),并将你自己的自定义配置写入到该目录下的一个文件中。
317+
318+
例如,您可以添加一个新的本地文件`/etc/systemd/system/kubelet.service.d/local-overrides.conf`
319+
以覆盖“kubeadm”配置的单元设置。
320+
321+
以下是你可能在“/usr/lib/systemd/kubelet.service.d/10 kubeadm.conf”中找到的内容:
306322

307323
{{< note >}}
308324
<!--

0 commit comments

Comments
 (0)