From c8d75effcb2cfd3ad409829efc566476cf588fd1 Mon Sep 17 00:00:00 2001
From: peterw <12556909+pedro-peter@users.noreply.github.com>
Date: Tue, 11 Mar 2025 04:19:46 +0000
Subject: [PATCH]  cilium 1.17: fix etcd trusted-ca-file config var (#11986)

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

diff --git a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
index df3c8414a..83bae4645 100644
--- a/roles/network_plugin/cilium/templates/cilium/config.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
@@ -20,7 +20,11 @@ data:
     # In case you want to use TLS in etcd, uncomment the 'ca-file' line
     # and create a kubernetes secret by following the tutorial in
     # https://cilium.link/etcd-config
+{% if cilium_version | regex_replace('v') is version('1.17.0', '>=') %}
+    trusted-ca-file: "{{ cilium_cert_dir }}/ca_cert.crt"
+{% else %}
     ca-file: "{{ cilium_cert_dir }}/ca_cert.crt"
+{% endif %}
 
     # In case you want client to server authentication, uncomment the following
     # lines and create a kubernetes secret by following the tutorial in