zh-translation:/docs/setup/additional-setup/sidecar-injection/index.md #5410

sirius1024 · 2019-11-06T11:09:01Z

ref: servicemesher/istio-official-translation#1277

Add Installing the Sidecar section translations

istio-testing · 2019-11-06T11:09:17Z

Hi @sirius1024. 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 · 2019-11-06T11:22:46Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

@@ -9,37 +9,35 @@ aliases:
    - /docs/setup/kubernetes/additional-setup/sidecar-injection/
 ---

-## Injection
+## 注入


请问全文中所有的标题增加锚点。

已经加好测试过了。

rootsongjc

缺少锚点

Add anchor for sections

rootsongjc · 2019-11-06T12:11:29Z

/ok-to-test

vflong · 2019-11-06T14:05:51Z

/review

vflong · 2019-11-06T14:24:50Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

@@ -9,37 +9,35 @@ aliases:
    - /docs/setup/kubernetes/additional-setup/sidecar-injection/


所有内部超链接前需要添加 /zh，例如
/zh/docs/setup/kubernetes/additional-setup/sidecar-injection/
/zh/docs/reference/commands/istioctl

所有内部超链接已经修复

vflong · 2019-11-06T14:33:28Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

-title: Installing the Sidecar
-description: Install the Istio sidecar in application pods automatically using the sidecar injector webhook or manually using istioctl CLI.
+title: 设置 Sidecar
+description: 在应用程序 Pod 中使用 sidecar injector webhook 自动安装或使用 istioctl CLI 手动安装 Istio sidecar 。


中文标点与英文之间不需要加空格

已经修复

vflong · 2019-11-06T14:33:48Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-Manual injection directly modifies configuration, like deployments, and injects the proxy configuration into it.
+手动注入直接修改配置，如 deployment ，并将代理配置注入其中。


中文标点与英文之间不需要加空格

已经修复

vflong · 2019-11-06T14:34:31Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

-The above command will not remove the injected sidecars from Pods. A
-rolling update or simply deleting the pods and forcing the deployment
-to create them is required.
+上面的命令不会从 pod 中移除注入的 sidecar 。需要进行滚动更新或者直接删除 pod ，并强制 deployment 创建它们。


中文标点与英文之间不需要加空格

已经修复

luxious · 2019-11-06T14:38:57Z

/review

1. Add `/zh` at the head of internal links 2. Fix punctuations with space

luxious · 2019-11-06T14:15:18Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

@@ -134,41 +130,27 @@ sleep-776b7bcdcd-bhn9m   2/2       Terminating   0          2m
 sleep-776b7bcdcd-gmvnr   1/1       Running       0          2s
 {{< /text >}}

-#### Understanding what happened
+#### 理解其过程{#understanding-what-happened}


翻译为理解原理，详见术语表。
https://github.com/servicemesher/istio-official-translation/blob/master/term.md

luxious · 2019-11-06T14:16:06Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

-title: Installing the Sidecar
-description: Install the Istio sidecar in application pods automatically using the sidecar injector webhook or manually using istioctl CLI.
+title: 设置 Sidecar
+description: 在应用程序 Pod 中使用 sidecar injector webhook 自动安装或使用 istioctl CLI 手动安装 Istio sidecar 。


中文标点与英文之间不需要加空格，详见术语表。
https://github.com/servicemesher/istio-official-translation/blob/master/term.md

luxious · 2019-11-06T14:20:10Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

-`istio-sidecar-injector` configuration map specifies the configuration for the
-injected sidecar. To change how namespaces are selected for injection, you can
-edit the `MutatingWebhookConfiguration` with the following command:
+当 Kubernetes 调用 webhook 时， [`admissionregistration`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#mutatingwebhookconfiguration-v1beta1-admissionregistration-k8s-io) 配置被应用。默认配置将 sidecar 注入到所有拥有 `istio-injection=enabled` 标签的 namespace 下的 pod 中。 `istio-sidecar-injector` 配置图指定了注入 sidecar 的配置。如需更改指定哪些 namespace 被注入，你可以使用以下命令编辑 `MutatingWebhookConfiguration` ：


英文与中文标点直接不需要加空格。

configuration map 翻译为配置图似乎不合适，map 在这里应该是指映射或字典。

configuration map 翻译为配置图似乎不合适，map 在这里应该是指映射或字典。
不错。已经修改。
标点的哪些comments已经outdate了。您可以刷新一下，PR有更新这些错误。

luxious · 2019-11-06T14:34:09Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

@@ -286,19 +262,19 @@ data:
 ...
 {{< /text >}}

-The above statement means: Never inject on pods that have the label `openshift.io/build.name` **or** `openshift.io/deployer-pod-for.name` – the values of the labels don't matter, we are just checking if the keys exist. With this rule added, the OpenShift Builds use case illustrated above is covered, meaning auxiliary pods will not have sidecars injected (because source-to-image auxiliary pods **do** contain those labels).
+上面声明的意思是：永远不要注入带有 `openshift.io/build.name` **或者** `openshift.io/deployer-pod-for.name` 标签的 pod —— 标签的值无关紧要，我们只检查键睡否存在。添加了这个规则之后，就涵盖了上面所说的 OpenShift 的构建用例，也就是说辅助 pod 不会被注入 sidecar（因为 source-to-image 工具产生的辅助 pod **明确**包含这些标签）。


睡否 => 是否

luxious · 2019-11-06T14:46:41Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-To manually inject a deployment, use [`istioctl kube-inject`](/docs/reference/commands/istioctl/#istioctl-kube-inject):
+要手动注入 deployment ，请使用 [`istioctl kube-inject`](/docs/reference/commands/istioctl/#istioctl-kube-inject)：


deployment ，=> deployment，

luxious · 2019-11-06T14:47:18Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

 {{< /tip >}}

-When the injection webhook is enabled, any new pods that are created will automatically have a sidecar added to them.
+当注入 webhook 被启用后，任何新的 pod 都有将在创建时自动添加 sidecar 。


sidecar 。=> sidecar。

luxious · 2019-11-06T14:47:50Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


 {{< text bash >}}
 $ kubectl describe pod -l app=sleep
 {{< /text >}}

-Disable injection for the `default` namespace and verify new pods are created without the sidecar.
+禁用 `default` namespace 注入，并确认新的 pod 在创建时没有 sidecar 。


sidecar 。=> sidecar。

luxious · 2019-11-06T14:48:18Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-#### More control: adding exceptions
+有些情况下用户无法控制 pod 的创建，例如，这些用户是被其他人创建的。因此他们无法在 pod 中添加 `sidecar.istio.io/inject` 注解，来明确是否安装 sidecar 。


sidecar 。=> sidecar。

sirius1024 · 2019-11-07T02:12:27Z

/retest

vflong · 2019-11-07T02:42:39Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-Note that unlike manual injection, automatic injection occurs at the pod-level. You won't see any change to the deployment itself. Instead you'll want to check individual pods (via `kubectl describe`) to see the injected proxy.
+请注意，区别于手动注入，自动注入发生在 pod 层面。你将看不到 deployment 本身有任何更改。取而代之，需要检查单独的 pod（使用 `kubectl describe` ）来查询被注入的代理。


此处右括号前多了一个空格
的 pod（使用 kubectl describe ）来

vflong · 2019-11-07T02:48:31Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md

-`istio-sidecar-injector` configuration map specifies the configuration for the
-injected sidecar. To change how namespaces are selected for injection, you can
-edit the `MutatingWebhookConfiguration` with the following command:
+当 Kubernetes 调用 webhook 时， [`admissionregistration`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#mutatingwebhookconfiguration-v1beta1-admissionregistration-k8s-io) 配置被应用。默认配置将 sidecar 注入到所有拥有 `istio-injection=enabled` 标签的 namespace 下的 pod 中。 `istio-sidecar-injector` 配置字典指定了注入 sidecar 的配置。如需更改指定哪些 namespace 被注入，你可以使用以下命令编辑 `MutatingWebhookConfiguration` ：


中文标点与英文之间不需要加空格

命令编辑 MutatingWebhookConfiguration ：

vflong · 2019-11-07T02:52:35Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-The label selector approach gives a lot of flexibility on how to express those exceptions. Take a look at [these docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) to see what you can do with them!
+使用标签选择器的方法在表达这些例外时提供了很大的灵活性。查看 [这些文档](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) 看看可以用它们来做什么！


中文超链接前后无需加空格

vflong · 2019-11-07T03:08:31Z

content/zh/docs/setup/additional-setup/sidecar-injection/index.md


-The label selector approach gives a lot of flexibility on how to express those exceptions. Take a look at [these docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) to see what you can do with them!
+使用标签选择器的方法在表达这些例外时提供了很大的灵活性。查看[这些文档](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) 看看可以用它们来做什么！


超链接右侧多了一个空格 😅

超链接右侧多了一个空格 😅

Sorry for my negligence. Fixed.

luxious · 2019-11-07T04:55:48Z

/LGTM

rootsongjc

/lgtm

sirius1024 · 2019-11-07T05:32:41Z

/retest

vflong · 2019-11-07T05:44:20Z

/LGTM

sirius1024 added 2 commits November 6, 2019 19:04

Add Installing the Sidecar translations

80bc332

Merge branch 'zh-trans-1227'

f62e2ce

Add Installing the Sidecar section translations

sirius1024 requested a review from a team as a code owner November 6, 2019 11:09

istio-policy-bot added the kind/docs label Nov 6, 2019

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 added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test labels Nov 6, 2019

rootsongjc reviewed Nov 6, 2019

View reviewed changes

rootsongjc suggested changes Nov 6, 2019

View reviewed changes

rootsongjc added the translation/chinese Translation item label Nov 6, 2019

sirius1024 added 2 commits November 6, 2019 19:34

Add anchor for sections

04f8e28

Merge branch 'zh-trans-1227'

c1f2456

Add anchor for sections

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 6, 2019

rootsongjc assigned vflong Nov 6, 2019

vflong suggested changes Nov 6, 2019

View reviewed changes

rootsongjc assigned luxious and vflong and unassigned vflong Nov 6, 2019

sirius1024 added 6 commits November 7, 2019 09:31

Fix review comments

4d65280

1. Add `/zh` at the head of internal links 2. Fix punctuations with space

Merge branch 'zh-trans-1227'

863eb54

Supplementary update

2b0f4fd

Merge branch 'zh-trans-1227'

11d207e

Fix link lint

d8c4eb6

Merge branch 'zh-trans-1227'

5b7c924

luxious suggested changes Nov 7, 2019

View reviewed changes

sirius1024 added 2 commits November 7, 2019 10:11

Fix link lint

4c44189

Merge branch 'zh-trans-1227'

15ac88c

sirius1024 added 6 commits November 7, 2019 10:21

Fix chinese spellings

2352901

Merge branch 'zh-trans-1227'

d668f25

Improve configuration map translation

2011953

Merge branch 'zh-trans-1227'

b8239d4

Fix "understanding what happend" translation

66727dd

Merge branch 'zh-trans-1227'

d23d3c0

vflong suggested changes Nov 7, 2019

View reviewed changes

sirius1024 added 2 commits November 7, 2019 10:59

Fix spaces

9d59c4f

Merge branch 'zh-trans-1227'

fd09295

vflong suggested changes Nov 7, 2019

View reviewed changes

luxious approved these changes Nov 7, 2019

View reviewed changes

rootsongjc approved these changes Nov 7, 2019

View reviewed changes

sirius1024 added 2 commits November 7, 2019 13:32

Fix spaces

c611ef1

Merge branch 'zh-trans-1227'

0795c9b

istio-testing merged commit 7aad648 into istio:master Nov 7, 2019

		@@ -9,37 +9,35 @@ aliases:
		- /docs/setup/kubernetes/additional-setup/sidecar-injection/


		Manual injection directly modifies configuration, like deployments, and injects the proxy configuration into it.
		手动注入直接修改配置，如 deployment ，并将代理配置注入其中。


		To manually inject a deployment, use [`istioctl kube-inject`](/docs/reference/commands/istioctl/#istioctl-kube-inject):
		要手动注入 deployment ，请使用 [`istioctl kube-inject`](/docs/reference/commands/istioctl/#istioctl-kube-inject)：


		#### More control: adding exceptions
		有些情况下用户无法控制 pod 的创建，例如，这些用户是被其他人创建的。因此他们无法在 pod 中添加 `sidecar.istio.io/inject` 注解，来明确是否安装 sidecar 。


		Note that unlike manual injection, automatic injection occurs at the pod-level. You won't see any change to the deployment itself. Instead you'll want to check individual pods (via `kubectl describe`) to see the injected proxy.
		请注意，区别于手动注入，自动注入发生在 pod 层面。你将看不到 deployment 本身有任何更改。取而代之，需要检查单独的 pod（使用 `kubectl describe` ）来查询被注入的代理。


		The label selector approach gives a lot of flexibility on how to express those exceptions. Take a look at [these docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) to see what you can do with them!
		使用标签选择器的方法在表达这些例外时提供了很大的灵活性。查看 [这些文档](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) 看看可以用它们来做什么！


		The label selector approach gives a lot of flexibility on how to express those exceptions. Take a look at [these docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) to see what you can do with them!
		使用标签选择器的方法在表达这些例外时提供了很大的灵活性。查看[这些文档](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements) 看看可以用它们来做什么！

zh-translation:/docs/setup/additional-setup/sidecar-injection/index.md #5410

zh-translation:/docs/setup/additional-setup/sidecar-injection/index.md #5410

Uh oh!

Conversation

sirius1024 commented Nov 6, 2019 • edited by istio-policy-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-testing commented Nov 6, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rootsongjc left a comment

Choose a reason for hiding this comment

Uh oh!

rootsongjc commented Nov 6, 2019

Uh oh!

vflong commented Nov 6, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luxious commented Nov 6, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sirius1024 commented Nov 7, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

中文标点与英文之间不需要加空格

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luxious commented Nov 7, 2019

Uh oh!

rootsongjc left a comment

sirius1024 commented Nov 6, 2019 •

edited by istio-policy-bot

Loading