fix some errors
This commit is contained in:
@@ -5,7 +5,7 @@ module "ingress" {
|
||||
}
|
||||
|
||||
module "middlewares" {
|
||||
source = "../modules/middlewares"
|
||||
source = "../modules/middlewares"
|
||||
}
|
||||
|
||||
module "services" {
|
||||
|
||||
@@ -15,15 +15,11 @@ variable "kubernetes_input" {
|
||||
|
||||
}
|
||||
|
||||
variable default_middlwares {
|
||||
type = optional(string)
|
||||
default = "https-redirect,ratelimit"
|
||||
variable "default_middlewares" {
|
||||
type = string
|
||||
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" {
|
||||
# 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"
|
||||
"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" = 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 } : {}
|
||||
|
||||
|
||||
{
|
||||
"traefik.ingress.kubernetes.io/router.middlewares" = join(",", compact([var.default_middlewares, each.value.middlewares]))
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ resource "kubernetes_manifest" "traefik_Middleware_https-redirect" {
|
||||
}
|
||||
"spec" = {
|
||||
"redirectScheme" = {
|
||||
"scheme" = "https"
|
||||
"scheme" = "https"
|
||||
"permanent" = "true"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user