Merge pull request #91995 from liggitt/cluster-admission-config

Adjust admission webhook auth config for default-enabled admission plugins
This commit is contained in:
Kubernetes Prow Robot 2020-06-10 22:43:53 -07:00 committed by GitHub
commit 3a2e96efff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -965,7 +965,7 @@ EOF
# If GKE exec auth for webhooks has been requested, then
# ValidatingAdmissionWebhook should use it. Otherwise, run with the default
# config.
if [[ "${ADMISSION_CONTROL:-}" == *"ValidatingAdmissionWebhook"* && -n "${WEBHOOK_GKE_EXEC_AUTH:-}" ]]; then
if [[ -n "${WEBHOOK_GKE_EXEC_AUTH:-}" ]]; then
1>&2 echo "ValidatingAdmissionWebhook requested, and WEBHOOK_GKE_EXEC_AUTH specified. Configuring ValidatingAdmissionWebhook to use gke-exec-auth-plugin."
# Append config for ValidatingAdmissionWebhook to the shared admission