From 091248b7f417083649ebb113571fcca2ed387466 Mon Sep 17 00:00:00 2001
From: Clement Phu <34369901+cleman95@users.noreply.github.com>
Date: Mon, 26 Feb 2024 08:19:06 +0100
Subject: [PATCH] Add configuration to create cilium CNI plugin file when
 cilium>=1.14.0 (#10945)

---
 roles/network_plugin/cilium/templates/cilium/config.yml.j2 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
index 9fb5f2819..d5d6eaf7a 100644
--- a/roles/network_plugin/cilium/templates/cilium/config.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
@@ -69,6 +69,13 @@ data:
   # custom-cni-conf to "true", otherwise Cilium may overwrite the configuration.
   custom-cni-conf: "false"
 
+{% if cilium_version | regex_replace('v') is version('1.14.0', '>=') %}
+  # Tell the agent to generate and write a CNI configuration file
+  write-cni-conf-when-ready: /etc/cni/net.d/05-cilium.conflist
+  cni-exclusive: "{{ cilium_cni_exclusive }}"
+  cni-log-file: "{{ cilium_cni_log_file }}"
+{% endif %}
+
   # If you want cilium monitor to aggregate tracing for packets, set this level
   # to "low", "medium", or "maximum". The higher the level, the less packets
   # that will be seen in monitor output.