From 16e8ea3aaacfd9ccc3b430aad3e1c42bc9c0013d Mon Sep 17 00:00:00 2001 From: Stefano Sibilia Date: Mon, 9 Sep 2024 12:52:21 +0200 Subject: [PATCH 1/3] refs platform/3099: update ingress-nginx to 1.11.2 --- CHANGELOG.md | 8 ++++++++ README.md | 2 +- files/values.yaml.tftpl | 2 +- variables.tf | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ac2b64..de22e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.7.0] - 2024-09-9 + +[Compare with previous version](https://github.com/sparkfabrik/terraform-helm-ingress-nginx/compare/0.6.0...0.7.0) + +### Changed + +- Update to use Ingress-nginx 1.11.2 to solve CVE-2024-7646 (https://github.com/kubernetes/kubernetes/issues/126744) + ## [0.6.0] - 2024-05-29 [Compare with previous version](https://github.com/sparkfabrik/terraform-helm-ingress-nginx/compare/0.5.2...0.6.0) diff --git a/README.md b/README.md index 9c4bf09..b0d7a15 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This is Terraform module to install and configure the Nginx Ingress Controller. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [additional\_values](#input\_additional\_values) | Additional values to pass to the helm chart. | `list(string)` | `[]` | no | -| [chart\_version](#input\_chart\_version) | Chart version of the ingress controller. Consider the default value the reference version of the module and the base of the values.yaml.tftpl file. | `string` | `"4.10.1"` | no | +| [chart\_version](#input\_chart\_version) | Chart version of the ingress controller. Consider the default value the reference version of the module and the base of the values.yaml.tftpl file. | `string` | `"4.11.2"` | no | | [common\_labels](#input\_common\_labels) | Set of labels to apply to all resources. | `map(string)` | `{}` | no | | [create\_namespace](#input\_create\_namespace) | Create namespace for the ingress controller. If false, the namespace must be created before using this module. | `bool` | `true` | no | | [helm\_release\_name](#input\_helm\_release\_name) | Name of the helm release. | `string` | `"ingress-nginx"` | no | diff --git a/files/values.yaml.tftpl b/files/values.yaml.tftpl index 23ac090..548a7c4 100644 --- a/files/values.yaml.tftpl +++ b/files/values.yaml.tftpl @@ -1,4 +1,4 @@ -# https://github.com/kubernetes/ingress-nginx/blob/helm-chart-4.10.1/charts/ingress-nginx/values.yaml +# https://github.com/kubernetes/ingress-nginx/blob/helm-chart-4.11.2/charts/ingress-nginx/values.yaml %{~ if length(common_labels) > 0 } %{~ for lbl_key, lbl_value in common_labels } diff --git a/variables.tf b/variables.tf index 517f629..e814d60 100644 --- a/variables.tf +++ b/variables.tf @@ -7,7 +7,7 @@ variable "helm_release_name" { variable "chart_version" { description = "Chart version of the ingress controller. Consider the default value the reference version of the module and the base of the values.yaml.tftpl file." type = string - default = "4.10.1" + default = "4.11.2" } variable "create_namespace" { From 0e163eb89880c69b9dde0dfede85a5581e5230e8 Mon Sep 17 00:00:00 2001 From: Stefano Sibilia Date: Mon, 9 Sep 2024 14:59:39 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md Co-authored-by: Daniele Monti <62102073+Monska85@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de22e01..b07a0a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Changed -- Update to use Ingress-nginx 1.11.2 to solve CVE-2024-7646 (https://github.com/kubernetes/kubernetes/issues/126744) +- Update to use Ingress-nginx 1.11.2 to solve [CVE-2024-7646](https://github.com/kubernetes/kubernetes/issues/126744). ## [0.6.0] - 2024-05-29 From e4a043f5dc4ae0e3c017a687126773c80e41ba21 Mon Sep 17 00:00:00 2001 From: Stefano Sibilia Date: Mon, 9 Sep 2024 14:59:49 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Daniele Monti <62102073+Monska85@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b07a0a3..bef091f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -## [0.7.0] - 2024-09-9 +## [0.7.0] - 2024-09-09 [Compare with previous version](https://github.com/sparkfabrik/terraform-helm-ingress-nginx/compare/0.6.0...0.7.0)