Skip to content

zh-translation: docs/setup/platform-setup/openshift/index.md #5423

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
Merged
merged 3 commits into from
Nov 7, 2019
Merged

zh-translation: docs/setup/platform-setup/openshift/index.md #5423

merged 3 commits into from
Nov 7, 2019

Conversation

jakeslee
Copy link
Contributor

@jakeslee jakeslee commented Nov 6, 2019 •
edited by istio-policy-bot
Loading

@jakeslee jakeslee requested a review from a team as a code owner November 6, 2019 14:40
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Nov 6, 2019
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 6, 2019
@istio-testing
Copy link
Contributor

Hi @jakeslee. Thanks for your PR.

I'm waiting for a istio member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@rootsongjc rootsongjc added the translation/chinese Translation item label Nov 7, 2019
rootsongjc
rootsongjc reviewed Nov 7, 2019
View reviewed changes
content/zh/docs/setup/platform-setup/openshift/index.md Outdated
keywords: [platform-setup,openshift]
---

{{< warning >}}
OpenShift 4.1 and above use `nftables`, which is incompatible with the Istio `proxy-init` container. Make sure to use [CNI](/docs/setup/additional-setup/cni/) instead.
OpenShift 4.1 及以上版本使用的 `nftables` 与 Istio 的 `proxy-init` 容器不兼容。请使用 [CNI](/docs/setup/additional-setup/cni/) 插件代替。
Copy link
Member

Choose a reason for hiding this comment

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

所有链接前请加 /zh 前缀。

rootsongjc
rootsongjc suggested changes Nov 7, 2019
View reviewed changes
Copy link
Member

@rootsongjc rootsongjc left a comment

Choose a reason for hiding this comment

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

需要修改链接。

@jakeslee
Copy link
Contributor Author

jakeslee commented Nov 7, 2019

@rootsongjc added /zh prefix to all links.

@rootsongjc
Copy link
Member

/ok-to-test

@istio-testing istio-testing added ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. and removed needs-ok-to-test labels Nov 7, 2019
@rootsongjc rootsongjc self-assigned this Nov 7, 2019
rootsongjc
rootsongjc approved these changes Nov 7, 2019
View reviewed changes
Copy link
Member

@rootsongjc rootsongjc left a comment

Choose a reason for hiding this comment

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

/LGTM

@istio-testing istio-testing merged commit 57e8da1 into istio:master Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@rootsongjc rootsongjc rootsongjc approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@rootsongjc rootsongjc

Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. kind/docs ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. translation/chinese Translation item
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jakeslee @istio-testing @rootsongjc @googlebot @istio-policy-bot