Merge pull request #5892 from brendandburns/aws

Configure docker and kubelet on AWS master.

cluster/aws/config-default.sh

@@ -42,6 +42,7 @@ MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
 MINION_SCOPES=""
 POLL_SLEEP_INTERVAL=3
 PORTAL_NET="10.0.0.0/16"
+MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 
 
 # When set to true, Docker Cache is enabled by default as part of the cluster bring up.

cluster/aws/config-test.sh

@@ -38,6 +38,7 @@ MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
 MINION_SCOPES=""
 POLL_SLEEP_INTERVAL=3
 PORTAL_NET="10.0.0.0/16"
+MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 
 
 # When set to true, Docker Cache is enabled by default as part of the cluster bring up.

cluster/aws/templates/salt-master.sh

@@ -23,6 +23,7 @@ grains:
   roles:
     - kubernetes-master
   cloud: aws
+  cbr-cidr: "${MASTER_IP_RANGE}"
 EOF
 
 cat <<EOF > /etc/aws.conf

cluster/aws/util.sh

@@ -419,7 +419,8 @@ function kube-up {
     echo "readonly DNS_REPLICAS='${DNS_REPLICAS:-}'"
     echo "readonly DNS_SERVER_IP='${DNS_SERVER_IP:-}'"
     echo "readonly DNS_DOMAIN='${DNS_DOMAIN:-}'"
-    echo "readonly ADMISSION_CONTROL='${ADMISSION_CONTROL:-}'"    
+    echo "readonly ADMISSION_CONTROL='${ADMISSION_CONTROL:-}'"
+    echo "readonly MASTER_IP_RANGE='${MASTER_IP_RANGE:-}'"
     grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/common.sh"
     grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/format-disks.sh"
     grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/create-dynamic-salt-files.sh"

cluster/saltbase/salt/top.sls

@@ -46,6 +46,10 @@ base:
     - docker
     - sdn
 {% endif %}
+{% if grains['cloud'] is defined and grains['cloud'] == 'aws' %}
+    - docker
+    - kubelet
+{% endif %}
 {% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
     - docker
     - kubelet