github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10517 from chrishiestand/gke-scopes

Browse Source 
change shell var MINION_SCOPES to user setable
This commit is contained in:
Mike Danese
2015-07-24 09:22:25 -07:00
parent fab2c80281 db1a73317c
commit e9084f95d1
8 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/gce/util.sh
View File

@@ -685,11 +685,11 @@ function kube-up {
echo "Creating minions."
# TODO(mbforbes): Refactor setting scope flags.
local -a scope_flags=()
if (( "${#MINION_SCOPES[@]}" > 0 )); then
scope_flags=("--scopes" "$(join_csv ${MINION_SCOPES[@]})")
local scope_flags=
if [ -n "${MINION_SCOPES}" ]; then
scope_flags="--scopes ${MINION_SCOPES}"
else
scope_flags=("--no-scopes")
scope_flags="--no-scopes"
fi
write-node-env
@@ -1028,11 +1028,11 @@ function prepare-push() {
write-node-env
# TODO(mbforbes): Refactor setting scope flags.
local -a scope_flags=()
if (( "${#MINION_SCOPES[@]}" > 0 )); then
scope_flags=("--scopes" "${MINION_SCOPES[@]}")
local scope_flags=
if [ -n "${MINION_SCOPES}" ]; then
scope_flags="--scopes ${MINION_SCOPES}"
else
scope_flags=("--no-scopes")
scope_flags="--no-scopes"
fi
# Ugly hack: Since it is not possible to delete instance-template that is currently