From b15f3e182dd0df28f8f42f487b3714409d34019c Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Tue, 9 Apr 2019 11:45:07 +0200
Subject: [PATCH] add default routing to canal and disable bird checks (#4468)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-Author: Paweł Skrzyński
---
roles/network_plugin/canal/templates/canal-node.yaml.j2 | 1 -
roles/network_plugin/canal/templates/cni-canal.conflist.j2 | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/network_plugin/canal/templates/canal-node.yaml.j2 b/roles/network_plugin/canal/templates/canal-node.yaml.j2
index b05edcec7..80f25b1b6 100644
--- 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
diff --git a/roles/network_plugin/canal/templates/cni-canal.conflist.j2 b/roles/network_plugin/canal/templates/cni-canal.conflist.j2
index fc363ee81..28125212d 100644
--- 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",
--
GitLab