fix some errors

This commit is contained in:
pi-ux-ce@ARES
2026-10-16 16:42:43 +01:00
parent 312cc0c9d7
commit f7d1d77b6b
3 changed files with 8 additions and 17 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ module "ingress" {
} }
module "middlewares" { module "middlewares" {
source = "../modules/middlewares" source = "../modules/middlewares"
} }
module "services" { module "services" {
+6 -15
View File
@@ -15,15 +15,11 @@ variable "kubernetes_input" {
} }
variable default_middlwares { variable "default_middlewares" {
type = optional(string) type = string
default = "https-redirect,ratelimit" default = "traefik-https-redirect@kubernetescrd,traefik-ratelimit@kubernetescrd"
} }
variable "middlewares_list" {
type = optional(string)
default = join(",",var.default_middlwares,var.kubernetes_input.middlewares)
}
resource "kubernetes_ingress_v1" "automatic_ingress" { resource "kubernetes_ingress_v1" "automatic_ingress" {
# Keep your top-level filter for filtering active services # Keep your top-level filter for filtering active services
@@ -38,14 +34,9 @@ resource "kubernetes_ingress_v1" "automatic_ingress" {
"cert-manager.io/cluster-issuer" = "letsencrypt-prod" "cert-manager.io/cluster-issuer" = "letsencrypt-prod"
"traefik.ingress.kubernetes.io/router.entrypoints" = "websecure" "traefik.ingress.kubernetes.io/router.entrypoints" = "websecure"
}, },
# Simply injects the middleware string if it is present and not empty {
#lookup(each.value, "middlewares", "") != "" ? { "traefik.ingress.kubernetes.io/router.middlewares" = join(",", compact([var.default_middlewares, each.value.middlewares]))
# "traefik.ingress.kubernetes.io/router.middlewares" = each.value.middlewares }
#} : {}
#each.value.middlewares != null ? {"traefik.ingress.kubernetes.io/router.middlewares" = each.value.middlewares } : {}
var.middlewares_list != null ? {"traefik.ingress.kubernetes.io/router.middlewares" = var.middlewares_list } : {}
) )
} }
+1 -1
View File
@@ -26,7 +26,7 @@ resource "kubernetes_manifest" "traefik_Middleware_https-redirect" {
} }
"spec" = { "spec" = {
"redirectScheme" = { "redirectScheme" = {
"scheme" = "https" "scheme" = "https"
"permanent" = "true" "permanent" = "true"
} }
} }