Merge pull request #1508 from tmjd/update-calico-2-4-0

Update Calico to 2.4.1 release.

roles/network_plugin/calico/templates/calico-node.service.j2

@@ -11,6 +11,7 @@ ExecStart={{ docker_bin_dir }}/docker run --net=host --privileged \
  -e HOSTNAME=${CALICO_HOSTNAME} \
  -e IP=${CALICO_IP} \
  -e IP6=${CALICO_IP6} \
+ -e CLUSTER_TYPE=${CLUSTER_TYPE} \
  -e CALICO_NETWORKING_BACKEND=${CALICO_NETWORKING_BACKEND} \
  -e FELIX_DEFAULTENDPOINTTOHOSTACTION={{ calico_endpoint_to_host_action|default('RETURN') }} \
  -e AS=${CALICO_AS} \

roles/network_plugin/calico/templates/calico.env.j2

@@ -4,6 +4,11 @@ ETCD_CERT_FILE="{{ calico_cert_dir }}/cert.crt"
 ETCD_KEY_FILE="{{ calico_cert_dir }}/key.pem"
 CALICO_IP="{{ip | default(ansible_default_ipv4.address) }}"
 CALICO_IP6=""
+{% if calico_network_backend is defined and calico_network_backend == 'none' %}
+CLUSTER_TYPE="kubespray"
+{% else %}
+CLUSTER_TYPE="kubespray,bgp"
+{% endif %}
 {% if calico_network_backend is defined %}
 CALICO_NETWORKING_BACKEND="{{calico_network_backend }}"
 {% endif %}

roles/network_plugin/canal/templates/canal-node.yml.j2

@@ -146,6 +146,9 @@ spec:
             # Disable Calico BGP.  Calico is simply enforcing policy.
             - name: CALICO_NETWORKING
               value: "false"
+            # Cluster type to identify the deployment type
+            - name: CLUSTER_TYPE
+              value: "kubespray,canal"
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"