add default routing to canal and disable bird checks (#4468)

Co-Author: Paweł Skrzyński
5 years ago · b15f3e182d
2 changed files with 1 additions and 1 deletions
--- a/roles/network_plugin/canal/templates/canal-node.yaml.j2
+++ b/roles/network_plugin/canal/templates/canal-node.yaml.j2
@ -263,7 +263,6 @@ spec:
            exec:
              command:
              - /bin/calico-node
-              - -bird-ready
              - -felix-ready
 {% endif %}
            periodSeconds: 10
--- a/roles/network_plugin/canal/templates/cni-canal.conflist.j2
+++ b/roles/network_plugin/canal/templates/cni-canal.conflist.j2
@ -6,6 +6,7 @@
      "type": "flannel",
      "delegate": {
        "type": "calico",
+	"include_default_routes": true,
        "etcd_endpoints": "{{ etcd_access_addresses }}",
        "etcd_key_file": "{{ canal_cert_dir }}/key.pem",
        "etcd_cert_file": "{{ canal_cert_dir }}/cert.crt",