Merge pull request kubernetes#381 from yugui/feature/api-scope

Allows adding custom api scopes to service accounts available in minions.
duda · Jul 9, 2014 · 4b6ff69 · 4b6ff69
2 parents 9408bd7 + cf9ee4d
commit 4b6ff69
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 &