From c48c5fd3c08dbda0ccd1e12609fe019e8e9cf596 Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Tue, 6 Apr 2021 09:45:07 +0800 Subject: [PATCH 1/4] Fix wrong chinese translation --- .../production-environment/tools/kubeadm/install-kubeadm.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index 3e2b2c63d6..b8279f548d 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -402,8 +402,7 @@ systemctl enable --now kubelet 你必须这么做，直到 kubelet 做出对 SELinux 的支持进行升级为止。 -- 你可以保持 SELinux 处于弃用状态，前提是你知道如何配置它，不过这也意味着有些 - 配置是 kubeadm 所不支持的。 +- 如果你知道如何配置 SELinux 则可以将其保持启用状态，但可能需要设定部分 kubeadm 不支持的配置。 {{% /tab %}} {{% tab name="无包管理器的情况" %}} From 44b902cdf9855a73283d936840e962dca52f938f Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Wed, 7 Apr 2021 12:21:06 +0800 Subject: [PATCH 2/4] sync with upstream English version --- .../tools/kubeadm/install-kubeadm.md | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index b8279f548d..d81001d7c1 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -377,12 +377,12 @@ exclude=kubelet kubeadm kubectl EOF # 将 SELinux 设置为 permissive 模式（相当于将其禁用） -setenforce 0 -sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config +sudo setenforce 0 +sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config -yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes +sudo yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes -systemctl enable --now kubelet +sudo systemctl enable --now kubelet ``` 进一步的相关细节，可参阅 -[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)。 +[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file) 以及 [KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/) 请注意，你只需要在你的 cgroup 驱动程序不是 `cgroupfs` 时这么做， 因为它已经是 kubelet 中的默认值。 From f6fef933b7298ee6c7be4ce6a7c2f495e10a3671 Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Wed, 7 Apr 2021 12:24:37 +0800 Subject: [PATCH 3/4] minor fix --- .../production-environment/tools/kubeadm/install-kubeadm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index d81001d7c1..9772025c17 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -523,7 +523,7 @@ Please mind, that you **only** have to do that if the cgroup driver of your CRI is not `cgroupfs`, because that is the default value in the kubelet already. --> 进一步的相关细节，可参阅 -[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file) 以及 [KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/) +[使用配置文件来执行 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file) 以及 [KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/)。 请注意，你只需要在你的 cgroup 驱动程序不是 `cgroupfs` 时这么做， 因为它已经是 kubelet 中的默认值。 From 5391a59dc4299516bf198d0a43438021bcff1aca Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Wed, 7 Apr 2021 12:29:29 +0800 Subject: [PATCH 4/4] Update doc for future tracking --- .../production-environment/tools/kubeadm/install-kubeadm.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index 9772025c17..c584a05623 100644 --- a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -517,7 +517,8 @@ cgroupDriver: ```