From 81f07c37832c6599e02e75f6db90eabdf3f0b657 Mon Sep 17 00:00:00 2001
From: Mateus Caruccio <mateus.caruccio@getupcloud.com>
Date: Tue, 24 Mar 2020 11:10:49 -0300
Subject: [PATCH] Disable IPv6 support for canal's calico-node (#5684)

This implements the same behavior as https://github.com/kubernetes-sigs/kubespray/blob/a15a0b5eb954c29636b4257463ef29ab2f5a191c/roles/network_plugin/calico/templates/calico-node.yml.j2

More info: https://github.com/projectcalico/felix/issues/1447
---
 roles/network_plugin/canal/templates/canal-node.yaml.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/roles/network_plugin/canal/templates/canal-node.yaml.j2 b/roles/network_plugin/canal/templates/canal-node.yaml.j2
index 127d52330..8a737c374 100644
--- a/roles/network_plugin/canal/templates/canal-node.yaml.j2
+++ b/roles/network_plugin/canal/templates/canal-node.yaml.j2
@@ -224,6 +224,9 @@ spec:
             - name: FELIX_IPTABLESLOCKTIMEOUTSECS
               value: "10"
 {% endif %}
+            # Disable IPv6 on Kubernetes.
+            - name: FELIX_IPV6SUPPORT
+              value: "false"
             # Etcd SSL vars
             - name: ETCD_CA_CERT_FILE
               valueFrom: