Merge branch 'master' into release-1.8

This commit is contained in:
steveperry-53
2017-08-16 09:30:37 -07:00
19 changed files with 59 additions and 32 deletions
@@ -35,7 +35,7 @@ This page describes how to use Initializers and External Admission Webhooks.
* A list of pending pre-initialization tasks, stored in every object's metadata
(e.g., "AddMyCorporatePolicySidecar").
* A user customized controller, which actually perform those tasks. The name of the task
* A user customized controller, which actually performs those tasks. The name of the task
corresponds to the controller which performs the task. For clarity, we call
them *initializer controllers* in this page.