Turn flannel off by default

cluster/saltbase/salt/flannel-server/flannel-server.manifest

@@ -2,17 +2,17 @@
     "kind": "Pod",
     "apiVersion": "v1",
     "metadata": {
-        "name": "flannel-helper",
+        "name": "flannel-server",
         "namespace": "kube-system",
         "labels": {
-            "app": "flannel-helper",
+            "app": "flannel-server",
             "version": "v0.1"
         }
     },
     "spec": {
         "volumes": [
             {
-                "name": "varlogflannel",
+                "name": "varlog",
                 "hostPath": {
                     "path": "/var/log"
                 }
@@ -30,8 +30,8 @@
         ],
         "containers": [
             {
-                "name": "flannel-helper",
-                "image": "bprashanth/flannel-helper:0.1",
+                "name": "flannel-server-helper",
+                "image": "gcr.io/google_containers/flannel-server-helper:0.1",
                 "args": [
                     "--network-config=/etc/kubernetes/network.json",
                     "--etcd-prefix=/kubernetes.io/network",
@@ -66,7 +66,7 @@
                 },
                 "volumeMounts": [
                     {
-                        "name": "varlogflannel",
+                        "name": "varlog",
                         "mountPath": "/var/log"
                     }
                 ]

cluster/saltbase/salt/flannel-server/network.json

@@ -1,6 +1,6 @@
 {
-    "Network": "192.168.0.0/16",
-    "SubnetLen": 26,
+    "Network": "172.16.0.0/12",
+    "SubnetLen": 24,
     "Backend": {
         "Type": "vxlan",
         "VNI": 1

cluster/saltbase/salt/flannel/init.sls

@@ -1,3 +1,5 @@
+# TODO: Run flannel daemon in a static pod once we've moved the overlay network
+# setup into a network plugin.
 flannel-tar:
   archive:
     - extracted

cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest

@@ -10,7 +10,11 @@
 {% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%}
   {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%}
 {% endif -%}
-{% if pillar['allocate_node_cidrs'] is defined -%}
+# When we're using flannel it is responsible for cidr allocation.
+# This is expected to be a short-term compromise.
+{% if pillar.get('network_provider', '').lower() == 'flannel' %}
+  {% set allocate_node_cidrs = "--allocate-node-cidrs=false" -%}
+{% elif pillar['allocate_node_cidrs'] is defined -%}
   {% set allocate_node_cidrs = "--allocate-node-cidrs=" + pillar['allocate_node_cidrs'] -%}
 {% endif -%}
 {% if pillar['terminated_pod_gc_threshold'] is defined -%}
@@ -39,7 +43,7 @@
    {% set root_ca_file = "--root-ca-file=/srv/kubernetes/ca.crt" -%}
 {% endif -%}
 
-{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " --allocate-node-cidrs=false" + " " + terminated_pod_gc + " " + cloud_provider  + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
+{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + terminated_pod_gc + " " + cloud_provider  + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
 
 
 # test_args has to be kept at the end, so they'll overwrite any prior configuration

cluster/saltbase/salt/kubelet/default

@@ -85,6 +85,11 @@
   {% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%}
 {% endif -%}
 
+{% set experimental_flannel_overlay = "" -%}
+{% if pillar.get('network_provider', '').lower() == 'flannel' %}
+  {% set experimental_flannel_overlay = "--experimental-flannel-overlay=true" %}
+{% endif -%}
+
 # Run containers under the root cgroup and create a system container.
 {% set system_container = "" -%}
 {% set cgroup_root = "" -%}
@@ -117,4 +122,4 @@
 {% endif -%}
 
 # test_args has to be kept at the end, so they'll overwrite any prior configuration
-DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{test_args}}"
+DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{experimental_flannel_overlay}} {{test_args}}"

cluster/saltbase/salt/top.sls

@@ -13,7 +13,9 @@ base:
   'roles:kubernetes-pool':
     - match: grain
     - docker
+{% if pillar.get('network_provider', '').lower() == 'flannel' %}
     - flannel
+{% endif %}
     - helpers
     - cadvisor
     - kube-client-tools
@@ -41,8 +43,10 @@ base:
     - match: grain
     - generate-cert
     - etcd
+{% if pillar.get('network_provider', '').lower() == 'flannel' %}
     - flannel-server
     - flannel
+{% endif %}
     - kube-apiserver
     - kube-controller-manager
     - kube-scheduler