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.

Merge pull request #64172 from cjcullen/reorder
3449c2c7 · Kubernetes Submit Queue · GitHub · 97f4a64f · b3a31b28 · 3449c2c7
Unverified Commit 3449c2c7 authored May 24, 2018 by Kubernetes Submit Queue Committed by GitHub May 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

configure-helper.sh cluster/gce/gci/configure-helper.sh +1 -1

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -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\"}},"