From a54fbe26f372e2c5cccfc193b71f007ae2e441c9 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Fri, 22 Dec 2023 23:01:01 +0930
Subject: [PATCH] feat(calico): use vxlan overlay

/assign @jon_nfc

/spend 6h

!16
---
 templates/calico.yaml.j2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/calico.yaml.j2 b/templates/calico.yaml.j2
index 1a10dd1..5884f82 100644
--- a/templates/calico.yaml.j2
+++ b/templates/calico.yaml.j2
@@ -48,7 +48,7 @@ data:
   # Typha is disabled.
   typha_service_name: "none"
   # Configure the backend to use.
-  calico_backend: "bird"
+  calico_backend: "vxlan"
 
   # Configure the MTU to use for workload interfaces and tunnels.
   # By default, MTU is auto-detected, and explicitly setting this field should not be required.
@@ -4777,10 +4777,10 @@ spec:
               value: "Always"
             # Enable or Disable VXLAN on the default IP pool.
             - name: CALICO_IPV4POOL_VXLAN
-              value: "Never"
+              value: "Always"
             # Enable or Disable VXLAN on the default IPv6 IP pool.
             - name: CALICO_IPV6POOL_VXLAN
-              value: "Never"
+              value: "Always"
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom:
@@ -4833,7 +4833,7 @@ spec:
               command:
               - /bin/calico-node
               - -felix-live
-              - -bird-live
+              #- -bird-live
             periodSeconds: 10
             initialDelaySeconds: 10
             failureThreshold: 6
@@ -4843,7 +4843,7 @@ spec:
               command:
               - /bin/calico-node
               - -felix-ready
-              - -bird-ready
+              #- -bird-ready
             periodSeconds: 10
             timeoutSeconds: 10
           volumeMounts: