From 126b3135decefa77a42f17e50a23a16e0ae31729 Mon Sep 17 00:00:00 2001 From: Damon Wang Date: Fri, 24 Aug 2018 10:12:36 +0800 Subject: [PATCH] policy describe error (#2314) * the policy describe error * policy describe error * update policy desc --- content/docs/setup/kubernetes/sidecar-injection/index.md | 4 ++-- content_zh/docs/setup/kubernetes/sidecar-injection/index.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/docs/setup/kubernetes/sidecar-injection/index.md b/content/docs/setup/kubernetes/sidecar-injection/index.md index ca7662bd0e..8ba7b46d8b 100644 --- a/content/docs/setup/kubernetes/sidecar-injection/index.md +++ b/content/docs/setup/kubernetes/sidecar-injection/index.md @@ -174,11 +174,11 @@ injection policy and sidecar injection template. `disabled` - The sidecar injector will not inject the sidecar into 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 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. diff --git a/content_zh/docs/setup/kubernetes/sidecar-injection/index.md b/content_zh/docs/setup/kubernetes/sidecar-injection/index.md index 2dc0234e11..df3bafeac2 100644 --- a/content_zh/docs/setup/kubernetes/sidecar-injection/index.md +++ b/content_zh/docs/setup/kubernetes/sidecar-injection/index.md @@ -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 注入：