From aaaf82f308fb6cec595aedbeade7a62a8e2d78a2 Mon Sep 17 00:00:00 2001
From: Qasim Mehmood <18313886+ThisIsQasim@users.noreply.github.com>
Date: Wed, 24 Dec 2025 17:42:31 +0500
Subject: [PATCH] Fix cilium portmap (#12814)

---
 roles/network_plugin/cilium/tasks/install.yml       |  7 -------
 .../cilium/templates/000-cilium-portmap.conflist.j2 | 13 -------------
 .../network_plugin/cilium/templates/values.yaml.j2  |  3 +++
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 roles/network_plugin/cilium/templates/000-cilium-portmap.conflist.j2

diff --git a/roles/network_plugin/cilium/tasks/install.yml b/roles/network_plugin/cilium/tasks/install.yml
index 252ba093f..1f9e858f2 100644
--- a/roles/network_plugin/cilium/tasks/install.yml
+++ b/roles/network_plugin/cilium/tasks/install.yml
@@ -30,13 +30,6 @@
   when:
     - cilium_identity_allocation_mode == "kvstore"
 
-- name: Cilium | Enable portmap addon
-  template:
-    src: 000-cilium-portmap.conflist.j2
-    dest: /etc/cni/net.d/000-cilium-portmap.conflist
-    mode: "0644"
-  when: cilium_enable_portmap
-
 - name: Cilium | Render values
   template:
     src: values.yaml.j2
diff --git a/roles/network_plugin/cilium/templates/000-cilium-portmap.conflist.j2 b/roles/network_plugin/cilium/templates/000-cilium-portmap.conflist.j2
deleted file mode 100644
index 982a7c94f..000000000
--- a/roles/network_plugin/cilium/templates/000-cilium-portmap.conflist.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "cniVersion": "0.3.1",
-    "name": "cilium-portmap",
-    "plugins": [
-        {
-            "type": "cilium-cni"
-        },
-        {
-            "type": "portmap",
-            "capabilities": { "portMappings": true }
-        }
-    ]
-}
diff --git a/roles/network_plugin/cilium/templates/values.yaml.j2 b/roles/network_plugin/cilium/templates/values.yaml.j2
index c2c865172..6f2690b9c 100644
--- a/roles/network_plugin/cilium/templates/values.yaml.j2
+++ b/roles/network_plugin/cilium/templates/values.yaml.j2
@@ -56,6 +56,9 @@ bpf:
 cni:
   exclusive: {{ cilium_cni_exclusive | to_json }}
   logFile: {{ cilium_cni_log_file }}
+{% if cilium_enable_portmap %}
+  chainingMode: portmap
+{% endif %}
 
 autoDirectNodeRoutes: {{ cilium_auto_direct_node_routes | to_json }}