whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into release-1.8

Browse Source
This commit is contained in:
steveperry-53
2017-08-08 11:27:06 -07:00
parent 4032cd08d7 2576f404f0
commit b2eebbbc8c
93 changed files with 3689 additions and 1532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/bootstrap-tokens.md
+1 -1
View File
@@ -43,7 +43,7 @@ All features for Bootstrap Tokens are disabled by default in Kubernetes v1.6.
You can enable the Bootstrap Token authenticator with the
`--experimental-bootstrap-token-auth` flag on the API server. You can enable
the Bootstrap controllers by specifying them withthe `--controllers` flag on the
the Bootstrap controllers by specifying them with the `--controllers` flag on the
controller manager with something like
`--controllers=*,tokencleaner,bootstrapsigner`. This is done automatically when
using `kubeadm`.
docs/admin/extensible-admission-controllers.md
+1 -1
View File
@@ -283,5 +283,5 @@ and `Fail` policies, meaning that upon a communication error with the webhook
admission controller, the `GenericAdmissionWebhook` can admit or reject the
operation based on the configured policy.
After you create the `initializerConfiguration`, the system will take a few
After you create the `externalAdmissionHookConfiguration`, the system will take a few
seconds to honor the new configuration.