summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data.d/k3s-master/src-tf/ingress-haproxy.tf2
-rw-r--r--data.d/k3s-master/src-tf/ingress-nginx-direct.tf4
-rw-r--r--data.d/k3s-master/src-tf/ingress-nginx-proxy.tf4
3 files changed, 7 insertions, 3 deletions
diff --git a/data.d/k3s-master/src-tf/ingress-haproxy.tf b/data.d/k3s-master/src-tf/ingress-haproxy.tf
index c9d81a3..190ad7f 100644
--- a/data.d/k3s-master/src-tf/ingress-haproxy.tf
+++ b/data.d/k3s-master/src-tf/ingress-haproxy.tf
@@ -4,7 +4,7 @@ resource "helm_release" "ingress_haproxy" {
repository = "https://haproxytech.github.io/helm-charts"
chart = "kubernetes-ingress"
- version = "1.40.1"
+ version = "1.44.0"
values = [
<<-YAML
diff --git a/data.d/k3s-master/src-tf/ingress-nginx-direct.tf b/data.d/k3s-master/src-tf/ingress-nginx-direct.tf
index beb1bcb..4bea0f5 100644
--- a/data.d/k3s-master/src-tf/ingress-nginx-direct.tf
+++ b/data.d/k3s-master/src-tf/ingress-nginx-direct.tf
@@ -4,7 +4,7 @@ resource "helm_release" "ingress_nginx_direct" {
repository = "https://kubernetes.github.io/ingress-nginx"
chart = "ingress-nginx"
- version = "4.7.1"
+ version = "4.12.0"
values = [
<<-YAML
@@ -14,10 +14,12 @@ resource "helm_release" "ingress_nginx_direct" {
node-role.kubernetes.io/master: "true"
allowSnippetAnnotations: true
watchIngressWithoutClass: false
+ ingressClass: nginx-direct
ingressClassByName: false
ingressClassResource:
enabled: true
name: nginx-direct
+ controllerValue: k8s.io/ingress-nginx-direct
config:
block-user-agents: >
~*.*ahrefsbot.*,
diff --git a/data.d/k3s-master/src-tf/ingress-nginx-proxy.tf b/data.d/k3s-master/src-tf/ingress-nginx-proxy.tf
index 89c24ad..7a1042a 100644
--- a/data.d/k3s-master/src-tf/ingress-nginx-proxy.tf
+++ b/data.d/k3s-master/src-tf/ingress-nginx-proxy.tf
@@ -4,18 +4,20 @@ resource "helm_release" "ingress_nginx_proxy" {
repository = "https://kubernetes.github.io/ingress-nginx"
chart = "ingress-nginx"
- version = "4.7.1"
+ version = "4.12.0"
values = [
<<-YAML
controller:
kind: DaemonSet
allowSnippetAnnotations: true
+ ingressClass: nginx-proxy
watchIngressWithoutClass: false
ingressClassByName: false
ingressClassResource:
enabled: true
name: nginx-proxy
+ controllerValue: k8s.io/ingress-nginx-proxy
config:
block-user-agents: >
~*.*ahrefsbot.*,