From 61abf9c19e4f3ee4ed6c37d486c2797b3c7a1fd4 Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Thu, 4 Jan 2024 12:44:16 -0600 Subject: [PATCH] feat: (IAC-1186) Add support for ingress-nginx v1.9.X --- docs/CONFIG-VARS.md | 2 +- roles/baseline/defaults/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 22083833..280a039a 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -408,7 +408,7 @@ The EBS CSI driver is currently only used for kubernetes v1.23 or later AWS EKS | 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.3.0 is used for Kubernetes clusters whose version is <= 1.23.X, and version 4.7.1 is used for Kubernetes clusters whose version is >= 1.24.X. | baseline | +| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version 4.3.0 is used for Kubernetes clusters whose version is <= 1.24.X, and version 4.9.0 is used for Kubernetes clusters whose version is >= 1.25.X. | 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 diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 7f87225d..eccbee0d 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -32,13 +32,13 @@ METRICS_SERVER_CONFIG: ## Ingress-nginx - Defaults ingressVersions: k8sMinorVersionCeiling: - value: 23 + value: 24 api: chartVersion: 4.3.0 k8sMinorVersionFloor: - value: 24 + value: 25 api: - chartVersion: 4.7.1 + chartVersion: 4.9.0 ## Ingress-nginx - Ingress ##