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

Fix some proofing errors.

This commit is contained in:
mtail 2018-07-16 21:39:52 -07:00
parent 73aedcda73
commit eec52a447f
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/about/media-resources/index.md
View File

@ -13,7 +13,6 @@ us. Please feel free to borrow these:
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td class="logo"><img src="/img/istio-logo-blue-background.svg" alt="White logo with 'Istio Blue' background"></td> <td class="logo"><img src="/img/istio-logo-blue-background.svg" alt="White logo with 'Istio Blue' background"></td>
<td class="logo"><img style="background-color: lightgrey" src="/img/istio-logo.svg" alt="White logo with no background"></td> <td class="logo"><img style="background-color: lightgrey" src="/img/istio-logo.svg" alt="White logo with no background"></td>
@ -21,7 +20,6 @@ us. Please feel free to borrow these:
White logo in minimal container, with and without <i>Istio Blue</i> background White logo in minimal container, with and without <i>Istio Blue</i> background
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="logo"><img src="/img/istio-logo-social-blue-background.svg" alt="White logo with 'Istio Blue' background, square container"></td> <td class="logo"><img src="/img/istio-logo-social-blue-background.svg" alt="White logo with 'Istio Blue' background, square container"></td>
<td class="logo"><img style="background-color: lightgrey" src="/img/istio-logo-social.svg" alt="White logo with no background, square container"></td> <td class="logo"><img style="background-color: lightgrey" src="/img/istio-logo-social.svg" alt="White logo with no background, square container"></td>
@ -29,7 +27,6 @@ us. Please feel free to borrow these:
White logo in square container, with and without <i>Istio Blue</i> background White logo in square container, with and without <i>Istio Blue</i> background
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="logo"><img src="/img/istio-blue-logo-white-background.svg" alt="'Istio Blue` logo with white background"></td> <td class="logo"><img src="/img/istio-blue-logo-white-background.svg" alt="'Istio Blue` logo with white background"></td>
<td class="logo"><img style="background-color: lightgrey" src="/img/istio-blue-logo.svg" alt="`Istio Blue` logo with no background"></td> <td class="logo"><img style="background-color: lightgrey" src="/img/istio-blue-logo.svg" alt="`Istio Blue` logo with no background"></td>
@ -37,7 +34,6 @@ us. Please feel free to borrow these:
<i>Istio Blue</i> logo in minimal container, with and without white background <i>Istio Blue</i> logo in minimal container, with and without white background
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="logo"><img src="/img/istio-blue-logo-social-white-background.svg" alt="'Istio Blue` logo with white background, square container"></td> <td class="logo"><img src="/img/istio-blue-logo-social-white-background.svg" alt="'Istio Blue` logo with white background, square container"></td>
<td class="logo"><img style="background-color: lightgrey" src="/img/istio-blue-logo-social.svg" alt="'Istio Blue` logo with no background, square container"></td> <td class="logo"><img style="background-color: lightgrey" src="/img/istio-blue-logo-social.svg" alt="'Istio Blue` logo with no background, square container"></td>
@ -45,7 +41,6 @@ us. Please feel free to borrow these:
<i>Istio Blue</i> logo in square container, with and without white background <i>Istio Blue</i> logo in square container, with and without white background
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -84,12 +79,11 @@ Here's some advice about using these images:
<li><i class="dont fa fa-times"></i> Use the Istio logo for your application’s icon</li> <li><i class="dont fa fa-times"></i> Use the Istio logo for your application’s icon</li>
<li><i class="dont fa fa-times"></i> Create a modified version of the Istio logo</li> <li><i class="dont fa fa-times"></i> Create a modified version of the Istio logo</li>
<li><i class="dont fa fa-times"></i> Integrate the Istio logo into your logo</li> <li><i class="dont fa fa-times"></i> Integrate the Istio logo into your logo</li>
<li><i class="dont fa fa-times"></i> Change the colors or aspect ratio</li> <li><i class="dont fa fa-times"></i> Change the Istio logo's colors or aspect ratio</li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

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

@ -181,7 +181,7 @@ sleep-776b7bcdcd-gmvnr 1/1 Running 0 2s
#### Understanding what happened #### Understanding what happened
[admissionregistration.k8s.io/v1beta1#MutatingWebhookConfiguration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/##mutatingwebhookconfiguration-v1beta1-admissionregistration-k8s-io) [admissionregistration.k8s.io/v1beta1#MutatingWebhookConfiguration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#mutatingwebhookconfiguration-v1beta1-admissionregistration-k8s-io)
configures when the webhook is invoked by Kubernetes. The default configures when the webhook is invoked by Kubernetes. The default
supplied with Istio selects pods in namespaces with label supplied with Istio selects pods in namespaces with label
`istio-injection=enabled`. The set of namespaces in which injection `istio-injection=enabled`. The set of namespaces in which injection

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

@ -64,7 +64,7 @@ sleep 1 1 1 1 2h sleep,istio-pro
### Sidecar 的自动注入 ### Sidecar 的自动注入
使用 Kubernetes 的 [mutating webhook admission controller](https://kubernetes.io/docs/admin/admission-controllers/#validatingadmissionwebhook-alpha-in-18-beta-in-19)，可以进行 Sidecar 的自动注入。Kubernetes 1.9 以后的版本才具备这一能力。使用这一功能之前首先要检查 kube-apiserver 的进程，是否具备 `admission-control` 参数，并且这个参数的值中需要包含 `MutatingAdmissionWebhook` 以及 `ValidatingAdmissionWebhook` 两项，并且按照正确的顺序加载，这样才能启用 `admissionregistration` API： 使用 Kubernetes 的 [mutating webhook admission controller](https://kubernetes.io/docs/admin/admission-controllers)，可以进行 Sidecar 的自动注入。Kubernetes 1.9 以后的版本才具备这一能力。使用这一功能之前首先要检查 kube-apiserver 的进程，是否具备 `admission-control` 参数，并且这个参数的值中需要包含 `MutatingAdmissionWebhook` 以及 `ValidatingAdmissionWebhook` 两项，并且按照正确的顺序加载，这样才能启用 `admissionregistration` API：
{{< text bash >}} {{< text bash >}}
$ kubectl api-versions | grep admissionregistration $ kubectl api-versions | grep admissionregistration
@ -146,7 +146,7 @@ sleep-776b7bcdcd-gmvnr 1/1 Running 0 2s
#### 了解发生了什么 #### 了解发生了什么
被 Kubernetes 调用时，[admissionregistration.k8s.io/v1beta1#MutatingWebhookConfiguration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#mutatingwebhookconfiguration-v1beta1-admissionregistration) 会进行配置。Istio 提供的缺省配置，会在带有 `istio-injection=enabled` 标签的命名空间中选择 Pod。使用 `kubectl edit mutatingwebhookconfiguration istio-sidecar-injector` 命令可以编辑目标命名空间的范围。 被 Kubernetes 调用时，[admissionregistration.k8s.io/v1beta1#MutatingWebhookConfiguration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10) 会进行配置。Istio 提供的缺省配置，会在带有 `istio-injection=enabled` 标签的命名空间中选择 Pod。使用 `kubectl edit mutatingwebhookconfiguration istio-sidecar-injector` 命令可以编辑目标命名空间的范围。
> {{< warning_icon >}} 修改 mutatingwebhookconfiguration 之后，应该重新启动已经被注入 Sidecar 的 Pod。 > {{< warning_icon >}} 修改 mutatingwebhookconfiguration 之后，应该重新启动已经被注入 Sidecar 的 Pod。