Skip to content

Commit

Permalink
feat: 🎸 bump helm to 4.10.4 for eks 1.29 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
sj-williams committed Oct 30, 2024
1 parent 443efa0 commit 536bd32
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions templates/values.yaml.tpl
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down

0 comments on commit 536bd32

Please sign in to comment.