From cc507d7ace48145afa982eb5fd3da1d832de7ff0 Mon Sep 17 00:00:00 2001
From: Sergey <s.bondarev@southbridge.ru>
Date: Mon, 1 Jun 2020 22:44:14 +0300
Subject: [PATCH] disable bird-check flag for probes of calico-node pods when
calico_network_backend is not 'bird'. (#6217)
---
roles/network_plugin/calico/templates/calico-node.yml.j2 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index eb0e89db2..39961002e 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -284,7 +284,9 @@ spec:
command:
- /bin/calico-node
- -felix-live
+{% if calico_network_backend|default("bird") == "bird" %}
- -bird-live
+{% endif %}
{% endif %}
initialDelaySeconds: 5
failureThreshold: 6
@@ -299,7 +301,9 @@ spec:
exec:
command:
- /bin/calico-node
+{% if calico_network_backend|default("bird") == "bird" %}
- -bird-ready
+{% endif %}
- -felix-ready
{% endif %}
volumeMounts:
--
GitLab