update cilium configmap template for new routing mode and tunnel-prot…

…ocol options Ryan Lonergan [email protected]
kubernetes-sigs · Dec 1, 2023 · a7ad740 · a7ad740
1 parent 70bb19d
commit a7ad740
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
@@ -115,7 +115,14 @@ data:
   #   - disabled
   #   - vxlan (default)
   #   - geneve
+{% if cilium_version | regex_replace('v') is version('1.14.0', '<') %}
   tunnel: "{{ cilium_tunnel_mode }}"
+{% elif cilium_version | regex_replace('v') is version('1.14.0', '>=') and cilium_tunnel_mode == 'disabled' %}
+  routing-mode: 'native'
+{% elif cilium_version | regex_replace('v') is version('1.14.0', '>=') and cilium_tunnel_mode != 'disabled' %}
+  routing-mode: 'tunnel'
+  tunnel-protocol: "{{ cilium_tunnel_mode }}"
+{% endif %}
 
   # Enable Bandwidth Manager
   # Cilium’s bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation.