Skip to content

Sidecar-injector doc review fixes #1244

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 8, 2018
Merged

Sidecar-injector doc review fixes #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19eb0fb
Fixes to the doc after testing/reviewing it with release-0.8 istio br…
ymesika May 7, 2018
2c70d6c
Merge branch 'master' into side-injector-review
geeknoid May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The `rake test` part is to make sure you are not introducing HTML errors or bad
HTML-Proofer finished successfully.
```

in the output
in the output.

Alternatively, if you just want to develop locally w/o Docker/Kubernetes/Minikube, you can try installing Jekyll locally.
You may need to install other prerequisites manually (which is where using the docker image shines). Here's an example of doing
Expand Down
11 changes: 2 additions & 9 deletions _docs/setup/kubernetes/sidecar-injection.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,10 @@ unmodified. Sidecars can be updated selectively by manually deleting a pods or
systematically with a deployment rolling update.

Manual and automatic injection use the same templated configuration. Automatic
injection loads the configuration from the `istio-inject` ConfigMap in the
injection loads the configuration from the `istio-sidecar-injector` ConfigMap in the
`istio-system` namespace. Manual injection can load from a local file or from
the ConfigMap.

Two variants of the injection configuration are provided with the default
install: `istio-sidecar-injector-configmap-release.yaml`
and `istio-sidecar-injector-configmap-debug.yaml`. The injection configmap includes
the default injection policy and sidecar injection template. The debug version
includes debug proxy images and additional logging and core dump functionality used
for debugging the sidecar proxy.

### Manual sidecar injection

Use the built-in defaults template and dynamically fetch the mesh
Expand Down Expand Up @@ -212,7 +205,7 @@ supplied with Istio selects pods in namespaces with label `istio-injection=enabl
This can be changed by modifying the MutatingWebhookConfiguration in
`install/kubernetes/istio-sidecar-injector-with-ca-bundle.yaml`.

The `istio-inject` ConfigMap in the `istio-system` namespace the default
The `istio-sidecar-injector` ConfigMap in the `istio-system` namespace has the default
injection policy and sidecar injection template.

##### _**policy**_
Expand Down