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/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md #33635

Closed
wants to merge 1 commit into from

Conversation

zaunist
Copy link
Member

@zaunist zaunist commented May 12, 2022

…/install-kubeadm.md

part of #33475 setup-1

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 12, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign mengjiao-liu after the PR has been reviewed.
You can assign the PR to them by writing /assign @mengjiao-liu in a comment when ready.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot requested a review from chenxuc May 12, 2022 15:13
@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 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 f7ea314
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/627d241d4de9f500092b9991
😎 Deploy Preview https://deploy-preview-33635--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.

Comment on lines +189 to +190
<!--
{{< /note >}}
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
<!--
{{< /note >}}
{{< /note >}}
<!--

{{< note >}}
Docker Engine 没有实现 [CRI](/zh/docs/concepts/architecture/cri/),而这是容器运行时在 Kubernetes 中工作所需要的。
为此,必须安装一个额外的服务 [cri-dockerd](https://github.com/Mirantis/cri-dockerd)。
cri-dockerd 是一个基于传统的内置Docker引擎支持的项目,它在 1.24 版本从 kubelet 中[移除](/dockershim)。
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
cri-dockerd 是一个基于传统的内置Docker引擎支持的项目,它在 1.24 版本从 kubelet 中[移除](/dockershim)
cri-dockerd 是一个基于传统的内置Docker引擎支持的项目,它在 1.24 版本从 kubelet 中[移除](/zh/dockershim)

kubelet 可以使用已弃用的 dockershim 适配器与 Docker Engine 集成(dockershim 是 kubelet 本身的一部分)。
参阅[容器运行时](/zh/docs/setup/production-environment/container-runtimes/)
以了解更多信息。
下面的表格包括支持的操作系统的已知端点。
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
下面的表格包括支持的操作系统的已知端点
下面的表格包括被支持的操作系统的已知端点

|------------------------------------|----------------------------------------------|
| containerd | `unix:///var/run/containerd/containerd.sock` |
| CRI-O | `unix:///var/run/crio/crio.sock` |
| Docker Engine (using cri-dockerd) | `unix:///var/run/cri-dockerd.sock` |
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
| Docker Engine (using cri-dockerd) | `unix:///var/run/cri-dockerd.sock` |
| Docker Engine (使用 cri-dockerd) | `unix:///var/run/cri-dockerd.sock` |

| 运行时 | 域套接字 |
|------------------------------------|----------------------------------------------|
| containerd | `npipe:////./pipe/containerd-containerd` |
| Docker Engine (using cri-dockerd) | `npipe:////./pipe/cri-dockerd` |
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
| Docker Engine (using cri-dockerd) | `npipe:////./pipe/cri-dockerd` |
| Docker Engine (使用 cri-dockerd) | `npipe:////./pipe/cri-dockerd` |

@zaunist
Copy link
Member Author

zaunist commented May 13, 2022

Merge to #33634, so close this PR.

@zaunist zaunist closed this May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language 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.

3 participants