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.

Sign up for GitHub

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

Jump to bottom

[zh] fix and update setup/production-environment/container-runtimes.md #23468

Merged
merged 1 commit into from Aug 30, 2020
Merged

[zh] fix and update setup/production-environment/container-runtimes.md #23468

merged 1 commit into from Aug 30, 2020

Conversation

zhangguanzhang
Copy link
Contributor

fix and update

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 27, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @zhangguanzhang!

It looks like this is your first PR to kubernetes/website 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/website has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 27, 2020
@k8s-ci-robot k8s-ci-robot added language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Aug 27, 2020
@netlify
Copy link

netlify bot commented Aug 27, 2020 •
edited

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 91b8a10

https://deploy-preview-23468--kubernetes-io-master-staging.netlify.app

@zhangguanzhang
Copy link
Contributor Author

/assign @tengqm

tengqm
tengqm reviewed Aug 27, 2020
View reviewed changes
content/zh/docs/setup/production-environment/container-runtimes.md Outdated
@@ -525,24 +525,52 @@ apt-get update
apt-get install cri-o-1.15
```
{{% /tab %}}
{{% tab name="CentOS/RHEL 7.4+" codelang="bash" %}}
{{% tab name="CentOS/RHEL 7.4+" %}}
Copy link
Contributor

Choose a reason for hiding this comment

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

This corresponds to line 283 in the English source?
The English source is only for CentOS, pls double check and sync.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

got it

content/zh/docs/setup/production-environment/container-runtimes.md Outdated
```
-->

要在以下操作系统上安装，请讲环境变量 `$OS` 设置为下表中的相应字段：
Copy link
Contributor

Choose a reason for hiding this comment

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

s/讲/将/

content/zh/docs/setup/production-environment/container-runtimes.md Outdated

要在以下操作系统上安装，请讲环境变量 `$OS` 设置为下表中的相应字段：

| Operating system | $OS |
Copy link
Contributor

Choose a reason for hiding this comment

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

s/Operating system/操作系统/

@zhangguanzhang zhangguanzhang force-pushed the update-zh-container-runtimes branch 3 times, most recently from ed6c6bb to a344028 Compare August 27, 2020 05:56
@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 Aug 27, 2020
@tengqm
Copy link
Contributor

tengqm commented Aug 27, 2020

Thank you!
/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 Aug 27, 2020
markthink
markthink reviewed Aug 30, 2020
View reviewed changes
Copy link

@markthink markthink left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markthink, 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

@k8s-ci-robot k8s-ci-robot merged commit c7e5985 into kubernetes:master Aug 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markthink markthink markthink left review comments

@bart0sh bart0sh Awaiting requested review from bart0sh

@vincepri vincepri Awaiting requested review from vincepri

@tengqm tengqm Awaiting requested review from tengqm

Assignees

@markthink markthink

@tengqm tengqm

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zhangguanzhang @k8s-ci-robot @tengqm @markthink