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] sync Misc Batch 1 #26237

Merged
merged 1 commit into from
Jan 26, 2021
Merged

[zh] sync Misc Batch 1 #26237

merged 1 commit into from
Jan 26, 2021

Conversation

CaoDonghui123
Copy link
Contributor

@CaoDonghui123 CaoDonghui123 commented Jan 25, 2021

part of #26178
sync :
content/zh/docs/tasks/extend-kubernetes/setup-konnectivity.md
content/zh/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 25, 2021
@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 Jan 25, 2021
@netlify
Copy link

netlify bot commented Jan 25, 2021

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

Built with commit 437c56d

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

* 可以存储任意数据。

为了与`apiextensions.k8s.iov1`兼容,将你的自定义资源定义更新为:
1. 使用OpenAPI 模式。
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
1. 使用OpenAPI 模式。
1. 使用结构化的 OpenAPI 模式。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for your suggestions

* 裁剪未启用。
* 可以存储任意数据。

为了与`apiextensions.k8s.iov1`兼容,将你的自定义资源定义更新为:
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
为了与`apiextensions.k8s.iov1`兼容,将你的自定义资源定义更新为:
为了与 `apiextensions.k8s.io/v1` 兼容,将你的自定义资源定义更新为:

应该将 CustomResourceDefinition 自身的 `spec.preserveUnknownFields` 设置为
`true`。
对于使用 `apiextensions.k8s.io/v1beta1` 且将 `spec.preserveUnknownFields` 设置为 `true`
创建的旧CustomResourceDefinition对象,以下条件也适用:
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
创建的旧CustomResourceDefinition对象,以下条件也适用
创建的旧 CustomResourceDefinition 对象,有以下表现

{{< codenew file="admin/konnectivity/egress-selector-configuration.yaml" >}}
2. 创建一个出口配置文件比如 `admin/konnectivity/egress-selector-configuration.yaml`。
3. 将 API 服务器的 `--egress-selector-config-file` 参数设置为你的 API 服务器的
1. 创建一个出口配置文件比如 `admin/konnectivity/egress-selector-configuration.yaml`。
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
1. 创建一个出口配置文件比如 `admin/konnectivity/egress-selector-configuration.yaml`
1. 创建一个出站流量配置文件,比如 `admin/konnectivity/egress-selector-configuration.yaml`

离站流量配置文件路径。
1. 如果您使用UDS连接,则将卷配置添加到kube-apiserver:
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
1. 如果您使用UDS连接,则将卷配置添加到kube-apiserver:
1. 如果你在使用 UDS 连接,须将卷配置添加到 kube-apiserver:

* 可以存储任意数据。

为了与 `apiextensions.k8s.iov1` 兼容,将你的自定义资源定义更新为:
1. 使用结构化打 OpenAPI 模式。
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
1. 使用结构化打 OpenAPI 模式。
1. 使用结构化的 OpenAPI 模式。

@@ -543,7 +543,7 @@ resource definitions to:
* 可以存储任意数据。

为了与 `apiextensions.k8s.iov1` 兼容,将你的自定义资源定义更新为:
1. 使用结构化打 OpenAPI 模式。
1. 使用结构化的 OpenAPI 模式。
Copy link
Contributor

@tengqm tengqm Jan 26, 2021

Choose a reason for hiding this comment

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

此行前面加空行。

另,将三个 commits suash成1个。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

好的

@tengqm
Copy link
Contributor

tengqm commented Jan 26, 2021

/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 Jan 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm, ydFu

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

Copy link
Member

@SataQiu SataQiu left a comment

Choose a reason for hiding this comment

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

Thanks @CaoDonghui123
/lgtm

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: fc96925c7d4f07863f7b5e4b956cfb4704be589f

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 26, 2021
@k8s-ci-robot k8s-ci-robot merged commit 3523bd9 into kubernetes:master Jan 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/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.

5 participants