From 9008c40d0e03f84a368f964aaeba6f6f8cadd99e Mon Sep 17 00:00:00 2001
From: c-romeo <romeo.v.craciun@gmail.com>
Date: Thu, 23 Jan 2025 11:05:01 +0200
Subject: [PATCH] fix Calico typha deployment issue: #11916 (#11917)

---
 roles/network_plugin/calico/templates/calico-typha.yml.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2
index d1f37aa5d..f2cf74f97 100644
--- a/roles/network_plugin/calico/templates/calico-typha.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2
@@ -126,6 +126,10 @@ spec:
           - name: TYPHA_PROMETHEUSMETRICSPORT
             value: "{{ typha_prometheusmetricsport }}"
 {% endif %}
+{% if calico_ipam_host_local %}
+          - name: USE_POD_CIDR
+            value: "true"
+{% endif %}
 {% if typha_secure %}
         volumeMounts:
           - mountPath: /etc/typha
@@ -135,10 +139,6 @@ spec:
             subPath: ca.crt
             name: cacert
             readOnly: true
-{% endif %}
-{% if calico_ipam_host_local %}
-          - name: USE_POD_CIDR
-            value: "true"
 {% endif %}
         livenessProbe:
           httpGet: