Merge pull request #5390 from brendandburns/shell_sucks

cluster/gce/config-default.sh

@@ -33,6 +33,7 @@ INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"
 MASTER_TAG="${INSTANCE_PREFIX}-master"
 MINION_TAG="${INSTANCE_PREFIX}-minion"
+MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 
 # Compute IP addresses for nodes.
 function increment_ipv4 {

cluster/gce/configure-vm.sh

@@ -271,6 +271,7 @@ function salt-master-role() {
 grains:
   roles:
     - kubernetes-master
+  cbr-cidr: ${MASTER_IP_RANGE}
   cloud: gce
 EOF
 }

cluster/gce/util.sh

@@ -453,6 +453,7 @@ DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
 DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
 MASTER_HTPASSWD: $(yaml-quote ${MASTER_HTPASSWD})
 ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-})
+MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
 EOF
 
   if [[ "${master}" != "true" ]]; then
@@ -612,6 +613,7 @@ function kube-up {
     fi
 
   done
+  create-route "${MASTER_NAME}" "${MASTER_IP_RANGE}"
 
   # Wait for last batch of jobs.
   wait-for-jobs

cluster/saltbase/salt/top.sls

@@ -48,6 +48,10 @@ base:
     - docker
     - sdn
 {% endif %}
+{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
+    - docker
+{% endif %}
+
 
   'roles:kubernetes-pool-vsphere':
     - match: grain