Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zh]: Rsyc content/en/docs/setup/production-environment/tools/kubeadm setup-1 #33634

Merged
merged 1 commit into from
May 16, 2022
Merged

[zh]: Rsyc content/en/docs/setup/production-environment/tools/kubeadm setup-1 #33634

merged 1 commit into from
May 16, 2022

Conversation

zaunist
Copy link
Member

@zaunist zaunist commented May 12, 2022

#33475 setup-1

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 12, 2022
@k8s-ci-robot k8s-ci-robot requested a review from chenrui333 May 12, 2022 14:38
@k8s-ci-robot k8s-ci-robot added the language/zh Issues or PRs related to Chinese language label May 12, 2022
@k8s-ci-robot k8s-ci-robot requested a review from mengjiao-liu May 12, 2022 14:38
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label May 12, 2022
@netlify
Copy link

netlify bot commented May 12, 2022

Deploy Preview for kubernetes-io-main-staging ready!

Name Link
🔨 Latest commit 058989e
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/627ff3b297158300085e36a5
😎 Deploy Preview https://deploy-preview-33634--kubernetes-io-main-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

-->
## 当删除托管容器时 kubeadm 阻塞

如果 Docker 停止并且不删除 Kubernetes 所管理的所有容器,可能发生以下情况:
如果容器运行时停止并且不删除 Kubernetes 所管理的所有容器,可能发生以下情况:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
如果容器运行时停止并且不删除 Kubernetes 所管理的所有容器,可能发生以下情况:
如果容器运行时停止并未删除 Kubernetes 所管理的所有容器,可能发生以下情况:

Comment on lines 146 to 147
你也可以使用`crictl`来调试容器运行时的状态。参见
[Debugging Kubernetes nodes with crictl](/zh/docs/tasks/debug-application-cluster/crictl/)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
你也可以使用`crictl`来调试容器运行时的状态。参见
[Debugging Kubernetes nodes with crictl](/zh/docs/tasks/debug-application-cluster/crictl/)
你也可以使用`crictl`来调试容器运行时的状态。
参见[使用 CRICTL 调试 Kubernetes 节点](/zh/docs/tasks/debug/debug-cluster/crictl/)

@tengqm
Copy link
Contributor

tengqm commented May 13, 2022

I'd suggest combining commits to all three files under 'setup-1' into this PR.

@zaunist
Copy link
Member Author

zaunist commented May 13, 2022

I'd suggest combining commits to all three files under 'setup-1' into this PR.

Got it, I will merge this commit later

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 13, 2022
@zaunist zaunist changed the title [zh]: Rsyc content/en/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md [zh]: Rsyc content/en/docs/setup/production-environment/tools/kubeadm setup-1 May 13, 2022
@zaunist zaunist requested a review from tengqm May 13, 2022 12:39
| Docker Engine | `/var/run/dockershim.sock` |
| containerd | `/run/containerd/containerd.sock` |
| CRI-O | `/var/run/crio/crio.sock` |
如果你不指定运行时,kubeadm 会自动尝试通过扫描已知的端点列表来检测已安装的容器运行时
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
如果你不指定运行时,kubeadm 会自动尝试通过扫描已知的端点列表来检测已安装的容器运行时
如果你不指定运行时,kubeadm 会自动尝试通过扫描已知的端点列表来检测已安装的容器运行时

{{< /table >}}
-->
{{< table >}}
| 运行时 | 域套接字 |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
| 运行时 | 域套接字 |
| 运行时 | UNIX 域套接字 |

{{% tab name="Windows" %}}

{{< table >}}
| 运行时 | 域套接字 |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
| 运行时 | 域套接字 |
| 运行时 | Windows 命名管道路径 |

@@ -22,46 +22,46 @@ or upgrades for such nodes. The long term plan is to empower the tool
[etcdadm](https://github.com/kubernetes-sigs/etcdadm) to manage these
aspects.
-->
在本指南中,当 kubeadm 用作为外部 etcd 节点管理工具,请注意 kubeadm 不计划支持此类节点的证书更换或升级。对于长期规划是使用 [etcdadm](https://github.com/kubernetes-sigs/etcdadm) 增强工具来管理这方面。
在本指南中,当 kubeadm 用作为外部 etcd 节点管理工具,请注意 kubeadm 不计划支持此类节点的证书更换或升级。
对于长期规划是使用 [etcdadm](https://github.com/kubernetes-sigs/etcdadm) 增强工具来管理这方面。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
对于长期规划是使用 [etcdadm](https://github.com/kubernetes-sigs/etcdadm) 增强工具来管理这方面
对于长期规划是使用 [etcdadm](https://github.com/kubernetes-sigs/etcdadm) 增强工具来管理这些方面


默认情况下,kubeadm 在每个控制平面节点上运行一个本地 etcd 实例。也可以使用外部的 etcd 集群,并在不同的主机上提供 etcd 实例。
这两种方法的区别在 [Options for Highly Available topology](/docs/setup/production-environment/tools/kubeadm/ha-topology) 页面中有所阐述。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
这两种方法的区别在 [Options for Highly Available topology](/docs/setup/production-environment/tools/kubeadm/ha-topology) 页面中有所阐述
这两种方法的区别在[高可用拓扑的选项](/zh/docs/setup/production-environment/tools/kubeadm/ha-topology)页面中阐述

@@ -131,39 +145,52 @@ kubeadm 包含生成下述证书所需的所有必要的密码学工具;在这
使用以下脚本为每个将要运行 etcd 成员的主机生成一个 kubeadm 配置文件。

```sh
# 使用 IP 或可解析的主机名替换 HOST0、HOST1 和 HOST2
# 使用你的主机 IP 更新 HOST0、HOST1 和 HOST2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# 使用你的主机 IP 更新 HOST0、HOST1 和 HOST2
# 使用你的主机 IP 替换 HOST0、HOST1 和 HOST2 的 IP 地址

-->
## 当删除托管容器时 kubeadm 阻塞

如果 Docker 停止并且不删除 Kubernetes 所管理的所有容器,可能发生以下情况:
如果容器运行时停止并未删除 Kubernetes 所管理的所有容器,可能发生以下情况:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
如果容器运行时停止并未删除 Kubernetes 所管理的所有容器,可能发生以下情况:
如果容器运行时停止并且未删除 Kubernetes 所管理的容器,可能发生以下情况:

@zaunist zaunist requested a review from tengqm May 14, 2022 18:24
@tengqm
Copy link
Contributor

tengqm commented May 15, 2022

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2022
@tengqm
Copy link
Contributor

tengqm commented May 15, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mengjiao-liu
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2022
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4edcb5ad03bf7427092b7f76c5c04ae06c6d300f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants