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

Jump to bottom

Update Ingress Nginx version #565

Merged
merged 1 commit into from
Feb 23, 2022
Merged

Update Ingress Nginx version #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

### Changed

- [#565](https://github.com/XenitAB/terraform-modules/pull/565) [Breaking] Update Ingress Nginx major version.

### Fixed

- [#570](https://github.com/XenitAB/terraform-modules/pull/570) Only add network policy for Datadog / Grafana-Agent if default deny is true
Expand Down
8 changes: 4 additions & 4 deletions modules/kubernetes/ingress-nginx/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resource "helm_release" "ingress_nginx" {
chart = "ingress-nginx"
name = "ingress-nginx"
namespace = kubernetes_namespace.this.metadata[0].name
version = "3.40.0"
version = "4.0.17"
max_history = 3
values = [templatefile("${path.module}/templates/values.yaml.tpl", {
http_snippet = var.http_snippet
Expand All @@ -57,7 +57,7 @@ resource "helm_release" "ingress_nginx" {
linkerd_enabled = var.linkerd_enabled
datadog_enabled = var.datadog_enabled
allow_snippet_annotations = var.allow_snippet_annotations
default_ingress_class = false
default_ingress_class = true
})]
}

Expand All @@ -72,7 +72,7 @@ resource "helm_release" "ingress_nginx_public" {
chart = "ingress-nginx"
name = "ingress-nginx-public"
namespace = kubernetes_namespace.this.metadata[0].name
version = "3.40.0"
version = "4.0.17"
max_history = 3
values = [templatefile("${path.module}/templates/values.yaml.tpl", {
http_snippet = var.http_snippet
Expand Down Expand Up @@ -104,7 +104,7 @@ resource "helm_release" "ingress_nginx_private" {
chart = "ingress-nginx"
name = "ingress-nginx-private"
namespace = kubernetes_namespace.this.metadata[0].name
version = "3.40.0"
version = "4.0.17"
max_history = 3
values = [templatefile("${path.module}/templates/values.yaml.tpl", {
http_snippet = var.http_snippet
Expand Down
9 changes: 5 additions & 4 deletions modules/kubernetes/ingress-nginx/templates/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ controller:

priorityClassName: platform-medium

ingressClass: ${ingress_class}

# https://github.com/kubernetes/ingress-nginx/issues/5593#issuecomment-647538272
ingressClassResource:
enabled: true
name: ${ingress_class}
default: ${default_ingress_class}
controllerValue: "k8s.io/ingress-${ingress_class}"

# Should eventually be removed as ingress class annotations are deprecated
ingressClass: ${ingress_class}

%{~ if provider == "aws" ~}
# Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true'.
Expand Down