Fix support for the nginx ingress controller.

This commit is contained in:
Tom Alexander
2025-03-22 16:11:04 -04:00
parent 8a0f78032c
commit 91dd7095da
6 changed files with 23 additions and 12 deletions

View File

@@ -8,8 +8,9 @@
# controller: k8s.io/ingress-nginx
module "nginx_ingress_controller" {
count = var.ingress_type == "nginx" ? 1 : 0
source = "../nginx_ingress_controller"
count = var.ingress_type == "nginx" ? 1 : 0
source = "../nginx_ingress_controller"
public_ingress = var.public_ingress
}
resource "kubernetes_ingress_v1" "ingress_nginx" {
@@ -18,7 +19,7 @@ resource "kubernetes_ingress_v1" "ingress_nginx" {
metadata {
name = "${var.cluster.name}-${each.value.metadata[0].name}"
annotations = {
"kubernetes.io/ingress.class" = var.public_ingress ? "gce" : "gce-internal"
"kubernetes.io/ingress.class" = "nginx"
}
}
@@ -41,5 +42,5 @@ resource "kubernetes_ingress_v1" "ingress_nginx" {
}
}
depends_on = [time_sleep.wait_service_cleanup]
depends_on = [time_sleep.wait_service_cleanup, module.nginx_ingress_controller]
}