Merge pull request #57426 from mikedanese/reorder

Automatic merge from submit-queue (batch tested with PRs 56995, 58498, 57426, 58902, 58863). 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>. gce: reorder authorizers to the order Node,Webhook,RBAC,ABAC ```release-note NONE ```

Merge pull request #57426 from mikedanese/reorder
bf05348e · Kubernetes Submit Queue · GitHub · 30c14dd8 · 76f22a02 · bf05348e
Unverified Commit bf05348e authored Jan 29, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 29, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +3 -2

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1702,7 +1702,7 @@ function start-kube-apiserver {
  fi
-  local authorization_mode="Node,RBAC"
+  local authorization_mode="RBAC"
  local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty"
  # Enable ABAC mode unless the user explicitly opts out with ENABLE_LEGACY_ABAC=false
@@ -1727,11 +1727,12 @@ function start-kube-apiserver {
  local webhook_config_mount=""
  local webhook_config_volume=""
  if [[ -n "${GCP_AUTHZ_URL:-}" ]]; then
-    authorization_mode+=",Webhook"
+    authorization_mode="Webhook,${authorization_mode}"
    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\"}},"
  fi
+  authorization_mode="Node,${authorization_mode}"
  params+=" --authorization-mode=${authorization_mode}"
  local container_env=""