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

update "runtime" docs in zh version #509

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

SherlockShemol
Copy link

  • Please check if the PR fulfills these requirements
  • Docs have been added / updated (for bug fixes / features)
  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

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:

@kubeedge-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign dingyin after the PR has been reviewed.
You can assign the PR to them by writing /assign @dingyin 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

@kubeedge-bot kubeedge-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 4, 2024
@wbc6080
Copy link
Contributor

wbc6080 commented Jan 4, 2024

It looks like the DCO signature is still unresolved. You need to execute git rebase HEAD~6 --signoff on your local branch, then git log check the commit record to see if all your commits are signed. After adding them all, then execute the git push --force-with-lease origin master command, which should solve the problem.

@SherlockShemol
Copy link
Author

It looks like the DCO signature is still unresolved. You need to execute git rebase HEAD~6 --signoff on your local branch, then git log check the commit record to see if all your commits are signed. After adding them all, then execute the git push --force-with-lease origin master command, which should solve the problem.

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.

@SherlockShemol
Copy link
Author

It looks like the DCO signature is still unresolved. You need to execute git rebase HEAD~6 --signoff on your local branch, then git log check the commit record to see if all your commits are signed. After adding them all, then execute the git push --force-with-lease origin master command, which should solve the problem.看起来 DCO 签名问题仍未解决。您需要在本地分支上执行 git rebase HEAD~6 --signoff ,然后 git log 检查提交记录,看看是否所有提交都已签名。全部添加完毕后,再执行 git push --force-with-lease origin master 命令,问题应该就解决了。

Finally I found out the problem.sorry for so many ugly commit.

@Shelley-BaoYue
Copy link
Collaborator

You can use git reset to merge these commits into one. The following steps are for your reference.

  • git reset bfc529d (Remember do not use git reset --hard )
  • git add *
  • git commit --amend -s
  • git push -f origin master

@SherlockShemol
Copy link
Author

You can use git reset to merge these commits into one. The following steps are for your reference.

* git reset [bfc529d](https://github.com/kubeedge/website/commit/bfc529d045f0407e770972489ede033ebcc1fa37)  (Remember do not use git reset --hard )

* git add *

* git commit --amend -s

* git push -f origin master

Thanks and it works! Time to learn more git command.

Copy link
Collaborator

@Shelley-BaoYue Shelley-BaoYue left a 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?

@SherlockShemol
Copy link
Author

I found that some pictures 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.

@Shelley-BaoYue
Copy link
Collaborator

I found that some pictures 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 git add?

@SherlockShemol
Copy link
Author

I found that some pictures 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 git add?

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
@SherlockShemol
Copy link
Author

I found that some pictures 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 git add?

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`,可以通过运行以下命令来安装:
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 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`作为其运行时:
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 装运的`containerd`时,cri 插件默认为禁用。您需要更新 containerd 的配置,以使 KubeEdge 使用`containerd`作为其运行时:
在使用 Docker 附带的`containerd`时,cri 插件默认为禁用。您需要更新 containerd 的配置,以使 KubeEdge 使用`containerd`作为其运行时:

@kubeedge-bot kubeedge-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 1, 2024
@kubeedge-bot
Copy link
Collaborator

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants