istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

policy describe error (#2314) 

* the policy describe error

* policy describe error

* update policy desc
This commit is contained in:
Damon Wang 2018-08-24 10:12:36 +08:00 committed by Martin Taillefer
parent 120e1567f3
commit 126b3135de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/docs/setup/kubernetes/sidecar-injection/index.md
View File

@ -174,11 +174,11 @@ injection policy and sidecar injection template.
`disabled` - The sidecar injector will not inject the sidecar into `disabled` - The sidecar injector will not inject the sidecar into
pods by default. Add the `sidecar.istio.io/inject` annotation with pods by default. Add the `sidecar.istio.io/inject` annotation with
value `true` to the pod template spec to enable injection. value `true` to the pod template spec to override the default and enable injection.
`enabled` - The sidecar injector will inject the sidecar into pods by `enabled` - The sidecar injector will inject the sidecar into pods by
default. Add the `sidecar.istio.io/inject` annotation with default. Add the `sidecar.istio.io/inject` annotation with
value `false` to the pod template spec to disable injection. value `false` to the pod template spec to override the default and disable injection.
The following example uses the `sidecar.istio.io/inject` annotation to disable sidecar injection. The following example uses the `sidecar.istio.io/inject` annotation to disable sidecar injection.

4
content_zh/docs/setup/kubernetes/sidecar-injection/index.md
View File

@ -140,9 +140,9 @@ sleep-776b7bcdcd-gmvnr 1/1 Running 0 2s
##### **策略** ##### **策略**
`disabled` - Sidecar 注入器缺省不会向 Pod 进行注入。在 Pod 模板中加入 `sidecar.istio.io/inject` 注解并赋值为 `true` 才能启用注入。 `disabled` - Sidecar 注入器缺省不会向 Pod 进行注入。在 Pod 模板中加入 `sidecar.istio.io/inject` 注解并赋值为 `true` 才能覆盖缺省值并启用注入。
`enabled` - Sidecar 注入器缺省会对 Pod 进行注入。在 Pod 模板中加入 `sidecar.istio.io/inject` 注解并赋值为 `false` 就会阻止对这一 Pod 的注入。 `enabled` - Sidecar 注入器缺省会对 Pod 进行注入。在 Pod 模板中加入 `sidecar.istio.io/inject` 注解并赋值为 `false` 才能覆盖缺省值并阻止对这一 Pod 的注入。
下面的例子用 `sidecar.istio.io/inject` 注解来禁用 Sidecar 注入： 下面的例子用 `sidecar.istio.io/inject` 注解来禁用 Sidecar 注入：