From 1c3e94b74ec5d1846b31c5f06158e70d93e16254 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 19 Aug 2025 10:02:12 +0530 Subject: [PATCH 1/4] Update ingress-nginx.yaml reverting conditional check as this is no more required --- roles/baseline/tasks/ingress-nginx.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/baseline/tasks/ingress-nginx.yaml b/roles/baseline/tasks/ingress-nginx.yaml index 0de40aa4..39378ee5 100644 --- a/roles/baseline/tasks/ingress-nginx.yaml +++ b/roles/baseline/tasks/ingress-nginx.yaml @@ -32,10 +32,10 @@ kubernetes.core.k8s_cluster_info: kubeconfig: "{{ KUBECONFIG }}" register: cluster_info - # Set the chart version based on cadence version if K8s version is >= threshold - - name: Set ingress-nginx chart version + # Set the chart version based on the minor version of the Kubernetes server + - name: Set the default INGRESS_NGINX_CHART_VERSION based on K8s server minor version set_fact: - INGRESS_NGINX_CHART_VERSION: "{{ ('4.12.1' if V4_CFG_CADENCE_VERSION is version('2025.07', '<=') else '4.13.0') if cluster_info.version.server.kubernetes.minor | int >= ingressVersions.k8sMinorVersion.value | int else '' }}" + INGRESS_NGINX_CHART_VERSION: "{{ ingressVersions.k8sMinorVersion.api.chartVersion if cluster_info.version.server.kubernetes.minor is version(ingressVersions.k8sMinorVersion.value, 'ge') else '' }}" # Output the selected chart version for debugging - name: Output INGRESS_NGINX_CHART_VERSION debug: From 03b334f79c6f6161632cfe3a3bdf685d29118cbd Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 19 Aug 2025 10:07:21 +0530 Subject: [PATCH 2/4] Update CONFIG-VARS.md revert docs changes for ingress-nignix --- docs/CONFIG-VARS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 68238b8a..56d20f86 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -414,7 +414,7 @@ By default, two block storage StorageClasses are created using the driver, one f | INGRESS_NGINX_NAMESPACE | NGINX Ingress Helm installation namespace | string | ingress-nginx | false | | baseline | | INGRESS_NGINX_CHART_URL | NGINX Ingress Helm chart URL | string | See [this document](https://kubernetes.github.io/ingress-nginx) for more information. | false | | baseline | | INGRESS_NGINX_CHART_NAME | NGINX Ingress Helm chart name | string | ingress-nginx | false | | baseline | -| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), the version is automatically set based on both Kubernetes minor version and cadence version: If Kubernetes minor version >= 1.29.X and cadence version <= 2025.07 → version `4.12.1` is used; If Kubernetes minor version >= 1.29.X and cadence version >= 2025.08 → version `4.13.0` is used; If Kubernetes minor version <= 1.28.X, you must manually set this variable to avoid errors; If defined in `ansible-var.yaml`, the provided value takes precedence over the above logic. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline | +| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.13.0` is used for Kubernetes clusters whose version is >= 1.29.X, for Kubernetes clusters whose version is <= 1.28.X you must set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline | | INGRESS_NGINX_CONFIG | NGINX Ingress Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. Altering this value will affect the cluster. | false | | baseline | ### Metrics Server From b55c3abf936bbeae8488e0fbde5015c18bf88b19 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 19 Aug 2025 10:19:25 +0530 Subject: [PATCH 3/4] Update ingress-nginx.yaml fix: indentation issues --- roles/baseline/tasks/ingress-nginx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/baseline/tasks/ingress-nginx.yaml b/roles/baseline/tasks/ingress-nginx.yaml index 39378ee5..8facabb4 100644 --- a/roles/baseline/tasks/ingress-nginx.yaml +++ b/roles/baseline/tasks/ingress-nginx.yaml @@ -32,7 +32,7 @@ kubernetes.core.k8s_cluster_info: kubeconfig: "{{ KUBECONFIG }}" register: cluster_info - # Set the chart version based on the minor version of the Kubernetes server + # Set the chart version based on the minor version of the Kubernetes server - name: Set the default INGRESS_NGINX_CHART_VERSION based on K8s server minor version set_fact: INGRESS_NGINX_CHART_VERSION: "{{ ingressVersions.k8sMinorVersion.api.chartVersion if cluster_info.version.server.kubernetes.minor is version(ingressVersions.k8sMinorVersion.value, 'ge') else '' }}" From e4c3a3b3453721603ac9cbdf1f0c4cd0fcb620e9 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 19 Aug 2025 12:07:01 +0530 Subject: [PATCH 4/4] Update CONFIG-VARS.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated INGRESS_NGINX_CHART_VERSION documentation to reflect Kubernetes version handling, cadence-based chart support (≤2025.07 uses 4.12.0, ≥2025.08 supports 1.13.x). --- docs/CONFIG-VARS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 56d20f86..cca0c772 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -414,7 +414,7 @@ By default, two block storage StorageClasses are created using the driver, one f | INGRESS_NGINX_NAMESPACE | NGINX Ingress Helm installation namespace | string | ingress-nginx | false | | baseline | | INGRESS_NGINX_CHART_URL | NGINX Ingress Helm chart URL | string | See [this document](https://kubernetes.github.io/ingress-nginx) for more information. | false | | baseline | | INGRESS_NGINX_CHART_NAME | NGINX Ingress Helm chart name | string | ingress-nginx | false | | baseline | -| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.13.0` is used for Kubernetes clusters whose version is >= 1.29.X, for Kubernetes clusters whose version is <= 1.28.X you must set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline | +| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.13.0` is used for Kubernetes clusters >= 1.29.X; for clusters <= 1.28.X, this must be set manually to avoid errors; for cadence ≤ 2025.07, version `4.12.0` is supported (note: Viya is not supported with `4.13.0`); for cadence ≥ 2025.08, any `1.13.x` version is supported — see [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for details. | baseline | | INGRESS_NGINX_CONFIG | NGINX Ingress Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. Altering this value will affect the cluster. | false | | baseline | ### Metrics Server