From acdcf705e264586da352c11b15c9b5cec227b80d Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 22 Mar 2018 02:24:07 +0800 Subject: [PATCH] Kill the reference to --admission-control option (#7755) The `--admission-control` option has been replaced by two new options in v1.10. This PR kills the last appearance of the old option in the doc. --- docs/admin/extensible-admission-controllers.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/admin/extensible-admission-controllers.md b/docs/admin/extensible-admission-controllers.md index 1b6f55503c..f8bb4b5370 100644 --- a/docs/admin/extensible-admission-controllers.md +++ b/docs/admin/extensible-admission-controllers.md @@ -342,8 +342,12 @@ user._ If there is an error encountered when calling an external admission webhook, that request is ignored and will not be used to approve/deny the admission request. -**Note:** The admission chain depends solely on the order of the -`--admission-control` option passed to `kube-apiserver`. +**Note** In kubernetes versions earlier than v1.10, the admission chain depends +only on the order of the `--admission-control` option passed to `kube-apiserver`. +In versions v1.10 and later, the `--admission-control` option is replaced by the +`--enable-admission-plugins` and the `--disable-admission-plugins` options. +The order of plugins for these two options no longer matters. +{: .note} ### Enable external admission webhooks