Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump helm 4.10.1 #102

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Bump helm 4.10.1 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
536bd32
feat: 🎸 bump helm to 4.10.4 for eks 1.29 compatibility
sj-williams Oct 30, 2024
bfeddee
chore: 🤖 update helm release to CRS 3.3.5 build for modsec
sj-williams Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
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.1"

values = [templatefile("${path.module}/templates/values.yaml.tpl", {
metrics_namespace = "ingress-controllers"
Expand Down
8 changes: 8 additions & 0 deletions templates/values.yaml.tpl
View file
Open in desktop
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