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

@@ -514,7 +514,6 @@ resource "kubernetes_manifest" "clusterrolebinding_ingress_nginx_admission" {
resource "kubernetes_manifest" "configmap_ingress_nginx_ingress_nginx_controller" {
manifest = {
"apiVersion" = "v1"
"data" = null
"kind" = "ConfigMap"
"metadata" = {
"labels" = {
@@ -535,6 +534,9 @@ resource "kubernetes_manifest" "service_ingress_nginx_ingress_nginx_controller"
"apiVersion" = "v1"
"kind" = "Service"
"metadata" = {
"annotations" = {
"networking.gke.io/load-balancer-type" = var.public_ingress ? "External" : "Internal"
}
"labels" = {
"app.kubernetes.io/component" = "controller"
"app.kubernetes.io/instance" = "ingress-nginx"
@@ -612,6 +614,7 @@ resource "kubernetes_manifest" "service_ingress_nginx_ingress_nginx_controller_a
}
resource "kubernetes_manifest" "deployment_ingress_nginx_ingress_nginx_controller" {
computed_fields = ["metadata.annotations", "metadata.labels", "spec.template.metadata.labels"]
manifest = {
"apiVersion" = "apps/v1"
"kind" = "Deployment"
@@ -627,7 +630,6 @@ resource "kubernetes_manifest" "deployment_ingress_nginx_ingress_nginx_controlle
"namespace" = kubernetes_manifest.namespace_ingress_nginx.manifest.metadata.name
}
"spec" = {
"minReadySeconds" = 0
"revisionHistoryLimit" = 10
"selector" = {
"matchLabels" = {
@@ -795,6 +797,7 @@ resource "kubernetes_manifest" "deployment_ingress_nginx_ingress_nginx_controlle
}
resource "kubernetes_manifest" "job_ingress_nginx_ingress_nginx_admission_create" {
computed_fields = ["metadata.annotations", "metadata.labels", "spec.template.metadata.labels"]
manifest = {
"apiVersion" = "batch/v1"
"kind" = "Job"
@@ -872,6 +875,7 @@ resource "kubernetes_manifest" "job_ingress_nginx_ingress_nginx_admission_create
}
resource "kubernetes_manifest" "job_ingress_nginx_ingress_nginx_admission_patch" {
computed_fields = ["metadata.annotations", "metadata.labels", "spec.template.metadata.labels"]
manifest = {
"apiVersion" = "batch/v1"
"kind" = "Job"

View File

@@ -7,6 +7,11 @@ terraform {
}
}
variable "public_ingress" {
description = "Set to true to make the kubernetes ingresses exposed to the public internet."
type = bool
}
data "google_client_config" "default" {}
resource "kubernetes_cluster_role_binding" "cluster_admin_binding" {