Add ingress-nginx version to strict-validate-path-type use expression

Signed-off-by: David.Houck <[email protected]>
sassoftware · Dec 13, 2024 · 69e2552 · 69e2552
1 parent 226a5da
commit 69e2552
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml
@@ -104,7 +104,7 @@ INGRESS_NGINX_STRICT_VALIDATE_PATH_TYPE:
     config:
       strict-validate-path-type: "false"
 
-# Ingress-nginx - Required for 2024.12 or later with v1.12+ but OK for any ingress-nginx version
+# Ingress-nginx - Required for ingress-nginx v1.12+
 INGRESS_NGINX_ANNOTATIONS_RISK_LEVEL:
   controller:
     config:

diff --git a/roles/baseline/tasks/ingress-nginx.yaml b/roles/baseline/tasks/ingress-nginx.yaml
@@ -85,15 +85,15 @@
 - name: Disable strict_validate_path_type in INGRESS_NGINX_CONFIG
   set_fact:
     INGRESS_NGINX_CONFIG: "{{ INGRESS_NGINX_CONFIG | combine(INGRESS_NGINX_STRICT_VALIDATE_PATH_TYPE, recursive=True) }}"
-  when: V4_CFG_CADENCE_VERSION is version('2024.11', "<=") and V4_CFG_CADENCE_NAME|lower != "fast"
+  when: (V4_CFG_CADENCE_VERSION is version('2024.11', "<=") and V4_CFG_CADENCE_NAME|lower != "fast") and INGRESS_NGINX_CHART_VERSION is version('4.12.0', ">=")
   tags:
     - install
     - update
 
 - name: Add annotations_risk_level to INGRESS_NGINX_CONFIG
   set_fact:
     INGRESS_NGINX_CONFIG: "{{ INGRESS_NGINX_CONFIG | combine(INGRESS_NGINX_ANNOTATIONS_RISK_LEVEL, recursive=True) }}"
-  when: (V4_CFG_CADENCE_VERSION is version('2024.12', ">=") or V4_CFG_CADENCE_NAME|lower == "fast") or INGRESS_NGINX_CHART_VERSION is version('4.12.0', ">=")
+  when: (V4_CFG_CADENCE_VERSION is version('2024.12', ">=") or V4_CFG_CADENCE_NAME|lower == "fast") and INGRESS_NGINX_CHART_VERSION is version('4.12.0', ">=")
   tags:
     - install
     - update