Skip to content

Commit fc54559

Browse files
authored
Merge pull request #27423 from srcmesh/fix/wrong-zh-translation
Fix wrong chinese translation (SELinux note)
2 parents 2e519b0 + 5391a59 commit fc54559

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,12 @@ exclude=kubelet kubeadm kubectl
377377
EOF
378378

379379
# 将 SELinux 设置为 permissive 模式(相当于将其禁用)
380-
setenforce 0
381-
sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config
380+
sudo setenforce 0
381+
sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config
382382

383-
yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes
383+
sudo yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes
384384

385-
systemctl enable --now kubelet
385+
sudo systemctl enable --now kubelet
386386
```
387387

388388
<!--
@@ -402,8 +402,7 @@ systemctl enable --now kubelet
402402

403403
你必须这么做,直到 kubelet 做出对 SELinux 的支持进行升级为止。
404404

405-
- 你可以保持 SELinux 处于弃用状态,前提是你知道如何配置它,不过这也意味着有些
406-
配置是 kubeadm 所不支持的。
405+
- 如果你知道如何配置 SELinux 则可以将其保持启用状态,但可能需要设定 kubeadm 不支持的部分配置
407406

408407
{{% /tab %}}
409408
{{% tab name="无包管理器的情况" %}}
@@ -415,7 +414,7 @@ Install CNI plugins (required for most pod network):
415414

416415
```bash
417416
CNI_VERSION="v0.8.2"
418-
mkdir -p /opt/cni/bin
417+
sudo mkdir -p /opt/cni/bin
419418
curl -L "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" | sudo tar -C /opt/cni/bin -xz
420419
```
421420

@@ -457,16 +456,12 @@ Install `kubeadm`, `kubelet`, `kubectl` and add a `kubelet` systemd service:
457456
RELEASE="$(curl -sSL https://dl.k8s.io/release/stable.txt)"
458457
cd $DOWNLOAD_DIR
459458
sudo curl -L --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
460-
chmod +x {kubeadm,kubelet,kubectl}
459+
sudo chmod +x {kubeadm,kubelet,kubectl}
461460

462461
RELEASE_VERSION="v0.4.0"
463462
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /etc/systemd/system/kubelet.service
464463
sudo mkdir -p /etc/systemd/system/kubelet.service.d
465464
curl -sSL "https://raw.githubusercontent.com/kubernetes/release/${RELEASE_VERSION}/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" | sed "s:/usr/bin:${DOWNLOAD_DIR}:g" | sudo tee /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
466-
467-
curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/kubelet.service" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service
468-
mkdir -p /etc/systemd/system/kubelet.service.d
469-
curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/10-kubeadm.conf" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
470465
```
471466

472467
<!--
@@ -522,13 +517,14 @@ cgroupDriver: <value>
522517
```
523518
524519
<!--
525-
For further details, please read [Using kubeadm init with a configuration file](/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file).
520+
For further details, please read [Using kubeadm init with a configuration file](/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)
521+
and the [`KubeletConfiguration` reference](/docs/reference/config-api/kubelet-config.v1beta1/)
526522

527523
Please mind, that you **only** have to do that if the cgroup driver of your CRI
528524
is not `cgroupfs`, because that is the default value in the kubelet already.
529525
-->
530526
进一步的相关细节,可参阅
531-
[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)。
527+
[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file) 以及 [KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/)
532528

533529
请注意,你只需要在你的 cgroup 驱动程序不是 `cgroupfs` 时这么做,
534530
因为它已经是 kubelet 中的默认值。

0 commit comments

Comments
 (0)