From 67b405b2f09bb9a9a0e8dfd1a84e18b697fde5f6 Mon Sep 17 00:00:00 2001
From: Ryan Lonergan <ryan.tlonergan@gmail.com>
Date: Fri, 1 Dec 2023 17:44:18 -0500
Subject: [PATCH] add conditional for cni-install.sh that's no longer included
 in cilium 1.14 Ryan Lonergan ryan.tlonergan@gmail.com

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

diff --git a/roles/network_plugin/cilium/templates/cilium/ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium/ds.yml.j2
index 38360342b3b..aabf20da067 100644
--- a/roles/network_plugin/cilium/templates/cilium/ds.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium/ds.yml.j2
@@ -106,6 +106,7 @@ spec:
         - {{ env_var | to_nice_yaml(indent=2) | indent(10) }}
 {% endfor %}
         lifecycle:
+{% if cilium_version | regex_replace('v') is version('1.14', '<=') %}
           postStart:
             exec:
               command:
@@ -114,6 +115,7 @@ spec:
 {% if cilium_version | regex_replace('v') is version('1.12', '>=') %}
               - "--enable-debug={{ cilium_debug | string | lower }}"
               - "--log-file={{ cilium_cni_log_file }}"
+{% endif %}
 {% endif %}
           preStop:
             exec: