Merge branch 'master' into name-suffixes

This commit is contained in:
Paul Haerle 2022-03-06 21:39:39 +01:00 committed by GitHub
commit ad5af04c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions

View File

@ -100,6 +100,7 @@ resource "null_resource" "kustomization" {
location = var.location
traefik_acme_tls = var.traefik_acme_tls
traefik_acme_email = var.traefik_acme_email
traefik_additional_options = var.traefik_additional_options
})
destination = "/tmp/post_install/traefik.yaml"
}

View File

@ -24,6 +24,9 @@ spec:
- "--entryPoints.websecure.proxyProtocol.trustedIPs=127.0.0.1/32,10.0.0.0/8"
- "--entryPoints.web.forwardedHeaders.trustedIPs=127.0.0.1/32,10.0.0.0/8"
- "--entryPoints.websecure.forwardedHeaders.trustedIPs=127.0.0.1/32,10.0.0.0/8"
%{ for option in traefik_additional_options ~}
- "${option}"
%{ endfor ~}
%{ if traefik_acme_tls ~}
- "--certificatesresolvers.le.acme.tlschallenge=true"
- "--certificatesresolvers.le.acme.email=${traefik_acme_email}"

View File

@ -96,3 +96,7 @@ load_balancer_type = "lb11"
# ]
# },
# ]
# If you want to configure additional Arguments for traefik, enter them here as a list and in the form of traefik CLI arguments; see https://doc.traefik.io/traefik/reference/static-configuration/cli/
# Example: traefik_additional_options = ["--log.level=DEBUG", "--tracing=true"]
# traefik_additional_options = []

View File

@ -132,3 +132,9 @@ variable "cluster_prefix" {
default = "k3s"
description = "Prefix for the cluster name"
}
variable "traefik_additional_options" {
type = list(string)
default = []
}