Docs etc

cluster/gce/config-default.sh

@@ -120,4 +120,3 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
 
 # Optional: if set to true, kube-up will configure the cluster to run e2e tests.
 E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
-FIREWALL_ETCD="${FIREWALL_SSH:-${NETWORK}-allow-etcd}"

cluster/gce/config-test.sh

@@ -134,4 +134,3 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
 E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
 # Overlay network settings
 OVERLAY_NETWORK=${OVERLAY_NETWORK:-true}
-FIREWALL_ETCD="${FIREWALL_SSH:-${NETWORK}-allow-etcd}"

cluster/gce/util.sh

@@ -304,7 +304,7 @@ function create-static-ip {
         echo -e "${color_red}Failed to create static ip $1 ${color_norm}" >&2
         exit 2
       fi
-      attempt=$(($attempt+1))
+      attempt=$(($attempt+1)) 
       echo -e "${color_yellow}Attempt $attempt failed to create static ip $1. Retrying.${color_norm}" >&2
       sleep $(($attempt * 5))
     else
@@ -603,28 +603,13 @@ function kube-up {
       --allow "tcp:22" &
   fi
 
+  echo "Starting master and configuring firewalls"
   gcloud compute firewall-rules create "${MASTER_NAME}-https" \
     --project "${PROJECT}" \
     --network "${NETWORK}" \
     --target-tags "${MASTER_TAG}" \
     --allow tcp:443 &
 
-  if [[ "${OVERLAY_NETWORK}" == "true" ]]; then
-    # TODO: Where to put this? Scope it to flannel setup.
-    if ! "${GCLOUD}" compute firewall-rules --project "${PROJECT}" describe "${FIREWALL_ETCD}" &>/dev/null; then
-      "${GCLOUD}" compute firewall-rules create "${FIREWALL_ETCD}" \
-        --network="${NETWORK}" \
-        --project="${PROJECT}" \
-        --source-ranges="10.0.0.0/8" \
-        --target-tags "${MINION_TAG}" \
-        --allow tcp:4001 &
-    else
-      echo "... Using etcd firewall-rule: ${FIREWALL_ETCD}" >&2
-    fi
-  else
-    echo "Not opening etcd up to the cluster: ${OVERLAY_NETWORK} ${FIREWALL_ETCD}"
-  fi
-
   # We have to make sure the disk is created before creating the master VM, so
   # run this in the foreground.
   gcloud compute disks create "${MASTER_NAME}-pd" \
@@ -687,7 +672,7 @@ function kube-up {
   write-node-env
 
   local template_name="${NODE_INSTANCE_PREFIX}-template"
-
+  
   create-node-instance-template $template_name
 
   gcloud compute instance-groups managed \

cluster/saltbase/salt/flannel-server/init.sls

@@ -8,7 +8,7 @@ touch /var/log/etcd_flannel.log:
 
 /etc/kubernetes/network.json:
   file.managed:
-    - source: salt://flannel/network.json
+    - source: salt://flannel-server/network.json
     - makedirs: True
     - user: root
     - group: root

cluster/saltbase/salt/flannel/network.json

@@ -1,8 +0,0 @@
-{
-    "Network": "18.16.0.0/16",
-    "SubnetLen": 24,
-    "Backend": {
-        "Type": "vxlan",
-        "VNI": 1
-     }
-}

cluster/saltbase/salt/top.sls

@@ -14,9 +14,6 @@ base:
     - match: grain
     - docker
     - flannel
-{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
-    - openvpn-client
-{% endif %}
     - helpers
     - cadvisor
     - kube-client-tools