Merge pull request #708 from vwfs/cloud_network

Add support for cloud-provider based networking

roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2

@@ -27,6 +27,11 @@ spec:
     - --cloud-config={{ kube_config_dir }}/cloud_config
 {% elif cloud_provider is defined and cloud_provider == "aws" %}
     - --cloud-provider={{cloud_provider}}
+{% endif %}
+{% if kube_network_plugin is defined and kube_network_plugin == 'cloud' %}
+    - --allocate-node-cidrs=true
+    - --configure-cloud-routes=true
+    - --cluster-cidr={{ kube_pods_subnet }}
 {% endif %}
     livenessProbe:
       httpGet:

roles/kubernetes/node/templates/kubelet.j2

@@ -31,6 +31,9 @@ KUBELET_ARGS="{{ kubelet_args }}"
 KUBELET_NETWORK_PLUGIN="--network-plugin=cni --network-plugin-dir=/etc/cni/net.d"
 {% elif kube_network_plugin is defined and kube_network_plugin == "weave" %}
 DOCKER_SOCKET="--docker-endpoint=unix:/var/run/weave/weave.sock"
+{% elif kube_network_plugin is defined and kube_network_plugin == "cloud" %}
+# Please note that --reconcile-cidr is deprecated and a no-op in Kubernetes 1.5 but still required in 1.4
+KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet --reconcile-cidr=true"
 {% endif %}
 # Should this cluster be allowed to run privileged docker containers
 KUBE_ALLOW_PRIV="--allow-privileged=true"

roles/kubernetes/preinstall/tasks/azure-credential-check.yml

@@ -44,4 +44,9 @@
     msg: "azure_vnet_name is missing"
   when: azure_vnet_name is not defined or azure_vnet_name == ""
 
+- name: check azure_route_table_name value
+  fail:
+    msg: "azure_route_table_name is missing"
+  when: azure_route_table_name is not defined or azure_route_table_name == ""
+