Merge pull request #64172 from cjcullen/reorder

Automatic merge from submit-queue (batch tested with PRs 63434, 64172, 63975, 64180, 63755). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

re-reorder authorizers (RBAC before Webhook).

Sort of reverts #57426

We aren't relying on the ordering for anything, and it's not worth the additional latency/traffic at this point.
This commit is contained in:
Kubernetes Submit Queue 2018-05-24 12:18:13 -07:00 committed by GitHub
commit 3449c2c70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1683,7 +1683,7 @@ function start-kube-apiserver {
local webhook_config_mount=""
local webhook_config_volume=""
if [[ -n "${GCP_AUTHZ_URL:-}" ]]; then
authorization_mode="Webhook,${authorization_mode}"
authorization_mode="${authorization_mode},Webhook"
params+=" --authorization-webhook-config-file=/etc/gcp_authz.config"
webhook_config_mount="{\"name\": \"webhookconfigmount\",\"mountPath\": \"/etc/gcp_authz.config\", \"readOnly\": false},"
webhook_config_volume="{\"name\": \"webhookconfigmount\",\"hostPath\": {\"path\": \"/etc/gcp_authz.config\", \"type\": \"FileOrCreate\"}},"