From 5d9fe6212ceb7ae32437dfe6a95ab6902c864243 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Thu, 12 Mar 2015 14:22:03 -0700 Subject: [PATCH] Add MASTER_IP_RANGE to e2e. --- cluster/gce/config-test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 46b4413c67d..8bf899c4941 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -35,6 +35,8 @@ MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" CLUSTER_IP_RANGE="10.245.0.0/16" MINION_IP_RANGES=($(eval echo "10.245.{1..${NUM_MINIONS}}.0/24")) +MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" + MINION_SCOPES=("storage-ro" "compute-rw") # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL=3 @@ -65,3 +67,5 @@ ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="kubernetes.local" DNS_REPLICAS=1 + +ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,ResourceQuota