From cf9ee4d9dd43f322a584b302eaa3de265fd5bec3 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Wed, 9 Jul 2014 15:02:57 +0900 Subject: [PATCH] Allows adding custom api scopes to service accounts available in minions. --- cluster/config-default.sh | 1 + cluster/config-test.sh | 2 +- cluster/kube-up.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/config-default.sh b/cluster/config-default.sh index 4a25ccc0249..d6d1ec09ca2 100755 --- a/cluster/config-default.sh +++ b/cluster/config-default.sh @@ -28,3 +28,4 @@ MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}})) MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24")) +MINION_SCOPES="" diff --git a/cluster/config-test.sh b/cluster/config-test.sh index 8d3e51aec5d..7685743b29e 100755 --- a/cluster/config-test.sh +++ b/cluster/config-test.sh @@ -28,4 +28,4 @@ MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}})) MINION_IP_RANGES=($(eval echo "10.245.{1..${NUM_MINIONS}}.0/24")) - +MINION_SCOPES="" diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh index 3ea610aa333..3a4f97ececc 100755 --- a/cluster/kube-up.sh +++ b/cluster/kube-up.sh @@ -95,7 +95,7 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do --image ${IMAGE} \ --tags ${MINION_TAG} \ --network ${NETWORK} \ - --service_account_scopes="" \ + --service_account_scopes=${MINION_SCOPES} \ --automatic_restart \ --can_ip_forward \ --metadata_from_file startup-script:${KUBE_TEMP}/minion-start-${i}.sh &