Merge pull request #10517 from chrishiestand/gke-scopes

change shell var MINION_SCOPES to user setable

cluster/gke/config-common.sh

@@ -30,6 +30,7 @@ GCLOUD="${GCLOUD:-gcloud}"
 CMD_GROUP="${CMD_GROUP:-alpha}"
 GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}"
 ENABLE_CLUSTER_DNS=false
+MINION_SCOPES="${MINION_SCOPES:-"compute-rw,storage-ro"}"
 
 # This is a hack, but I keep setting this when I run commands manually, and
 # then things grossly fail during normal runs because cluster/kubecfg.sh and

cluster/gke/util.sh

@@ -111,6 +111,7 @@ function verify-prereqs() {
 #   ZONE
 #   CLUSTER_API_VERSION (optional)
 #   NUM_MINIONS
+#   MINION_SCOPES
 function kube-up() {
   echo "... in kube-up()" >&2
   detect-project >&2
@@ -141,6 +142,7 @@ function kube-up() {
     "--project=${PROJECT}"
     "--num-nodes=${NUM_MINIONS}"
     "--network=${NETWORK}"
+    "--scopes=${MINION_SCOPES}"
   )
   if [[ ! -z "${DOGFOOD_GCLOUD:-}" ]]; then
     create_args+=("--cluster-version=${CLUSTER_API_VERSION:-}")