From 497d2ca306bab95bde3664f063178edee8e5b5b8 Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Tue, 31 Aug 2021 22:14:21 +0200
Subject: [PATCH] Fix Calico's FelixConfiguration when "IP in IP" is disabled
(#7926)
When using Calico with:
- `calico_network_backend: vxlan`,
- `calico_ipip_mode: "Never"`,
- `calico_vxlan_mode: "Always"`,
the `FelixConfiguration` object has `ipipEnabled: true`, when it should be false:
This is caused by an error in the `| bool` conversion in the install task:
when `calico_ipip_mode` is `Never`,
`{{ calico_ipip_mode != 'Never' | bool }}` evaluates to `true`:
---
roles/network_plugin/calico/tasks/install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index 41ae4134b..84dd1509a 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -153,7 +153,7 @@
"name": "default",
},
"spec": {
- "ipipEnabled": {{ calico_ipip_mode != 'Never' | bool }},
+ "ipipEnabled": {{ calico_ipip_mode != 'Never' }},
"reportingInterval": "{{ calico_felix_reporting_interval }}",
"bpfLogLevel": "{{ calico_bpf_log_level }}",
"bpfEnabled": {{ calico_bpf_enabled | bool }},
--
GitLab