-
Notifications
You must be signed in to change notification settings - Fork 145
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
update "runtime" docs in zh version #509
base: master
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 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 |
a19c646
to
aab66b2
Compare
It looks like the DCO signature is still unresolved. You need to execute |
7ac7370
to
b31c992
Compare
yes I have followed the instruction and signiture does appears in my git log.But DCO just doesn't pass.sorry for my unskilled pr.give me some time and I will figure out. |
9cd3cf2
to
6628cfa
Compare
Finally I found out the problem.sorry for so many ugly commit. |
You can use git reset to merge these commits into one. The following steps are for your reference.
|
Thanks and it works! Time to learn more git command. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found that some images have been updated in this PR, but I don’t quite understand what has been updated. Could you please describe it?
yes it's weird.I have done nothing to those images.I fork and clone the repo and go directly to modify the "runtime" file.But those images is shown to be modified. Maybe it's because of mode of the files. |
How about do not select these image files when |
yes, give me some time. |
Standardize Partners sort Signed-off-by: SherlockShemol <shemol@163.com> modified: i18n/zh/docusaurus-plugin-content-docs/current/setup/prerequisites/runtime.md
Done.Thank you. |
@@ -4,7 +4,7 @@ sidebar_position: 3 | |||
--- | |||
## containerd | |||
|
|||
Docker 18.09 and up ship with `containerd`, so you should not need to install it manually. If you do not have `containerd`, you may install it by running the following: | |||
Docker 18.09 及以上版本已随附`containerd`,因此无需手动安装。如果没有`containerd`,可以通过运行以下命令来安装: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
随附这个词有些奇怪,或许可以换为
Docker 18.09 及以上版本已随附`containerd`,因此无需手动安装。如果没有`containerd`,可以通过运行以下命令来安装: | |
Docker 18.09 及以上版本已附带`containerd`,因此无需手动安装。如果没有`containerd`,可以通过运行以下命令来安装: |
@@ -18,15 +18,15 @@ containerd config default > /etc/containerd/config.toml | |||
systemctl restart containerd | |||
``` | |||
|
|||
When using `containerd` shipped with Docker, the cri plugin is disabled by default. You will need to update `containerd`’s configuration to enable KubeEdge to use `containerd` as its runtime: | |||
在使用随 Docker 装运的`containerd`时,cri 插件默认为禁用。您需要更新 containerd 的配置,以使 KubeEdge 使用`containerd`作为其运行时: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
同上
在使用随 Docker 装运的`containerd`时,cri 插件默认为禁用。您需要更新 containerd 的配置,以使 KubeEdge 使用`containerd`作为其运行时: | |
在使用 Docker 附带的`containerd`时,cri 插件默认为禁用。您需要更新 containerd 的配置,以使 KubeEdge 使用`containerd`作为其运行时: |
@SherlockShemol: PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
docs update
What is the current behavior? (You can also link to an open issue here)
What is the new behavior (if this is a feature change)?
Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)
Other information: