From 536bd32cdd724ad8d77aa12c3105f066737447ff Mon Sep 17 00:00:00 2001
From: sj-williams <steve.williams@digital.justice.gov.uk>
Date: Wed, 30 Oct 2024 13:45:06 +0000
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20bump=20helm=20to=204?=
 =?UTF-8?q?.10.4=20for=20eks=201.29=20compatibility?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.tf                   | 2 +-
 templates/values.yaml.tpl | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/main.tf b/main.tf
index 553fd5c..70a543f 100644
--- a/main.tf
+++ b/main.tf
@@ -47,7 +47,7 @@ resource "helm_release" "nginx_ingress" {
   namespace  = "ingress-controllers"
   repository = "https://kubernetes.github.io/ingress-nginx"
   timeout    = 600
-  version    = "4.7.3"
+  version    = "4.10.4"
 
   values = [templatefile("${path.module}/templates/values.yaml.tpl", {
     metrics_namespace       = "ingress-controllers"
diff --git a/templates/values.yaml.tpl b/templates/values.yaml.tpl
index 3deba35..ec0ccc1 100644
--- a/templates/values.yaml.tpl
+++ b/templates/values.yaml.tpl
@@ -1,5 +1,7 @@
 nameOverride: ${name_override}
 controller:
+## enableAnnotationValidations defaults to false in 4.10.4, however bringing into template for future ref
+  enableAnnotationValidations: false
   image:
     chroot: false
     terminationGracePeriod: 600
@@ -12,6 +14,12 @@ controller:
       exec:
         command: ["/bin/sh", "-c", "sleep 30; /usr/local/openresty/nginx/sbin/nginx -c /etc/nginx/nginx.conf -s quit; while pgrep -x nginx; do sleep 1; done"]
 
+  # -- This configuration defines if Ingress Controller should allow users to set
+  # their own *-snippet annotations, otherwise this is forbidden / dropped
+  # when users add those annotations.
+  # Global snippets in ConfigMap are still respected
+  allowSnippetAnnotations: true
+  
 %{ if enable_modsec ~}
   extraVolumes:
   ## Additional volumes to the controller pod.

From bfeddee99afeaebb251e8c626dafb5fd8aaad2cf Mon Sep 17 00:00:00 2001
From: sj-williams <steve.williams@digital.justice.gov.uk>
Date: Wed, 30 Oct 2024 14:47:41 +0000
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20helm=20rel?=
 =?UTF-8?q?ease=20to=20CRS=203.3.5=20build=20for=20modsec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.tf b/main.tf
index 70a543f..756e862 100644
--- a/main.tf
+++ b/main.tf
@@ -47,7 +47,7 @@ resource "helm_release" "nginx_ingress" {
   namespace  = "ingress-controllers"
   repository = "https://kubernetes.github.io/ingress-nginx"
   timeout    = 600
-  version    = "4.10.4"
+  version    = "4.10.1"
 
   values = [templatefile("${path.module}/templates/values.yaml.tpl", {
     metrics_namespace       = "ingress-controllers"