viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

traefik/crowdsec: remove 6 hard-coded middleware refs the variable sweep missed (PR1/2)

Browse source 
The first PR1 commit only dropped the ingress_factory reference + the 8
exclude_crowdsec call sites. But the crowdsec middleware is ALSO hard-coded
(not via the variable) in 6 more ingresses that build their middleware chain by
hand: owntracks, the monitoring Helm values (grafana + prometheus +
alertmanager), and the reverse-proxy module + its own separate ingress factory.
Remove all 6 so that after the full-cluster apply NO live ingress references
traefik-crowdsec@kubernetescrd — the precondition for PR2 deleting the CRD.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Viktor Barzin 2026-06-21 00:17:40 +00:00
parent 84a18a5529
commit 71d0af084e
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stacks/monitoring/modules/monitoring/grafana_chart_values.yaml
View file

@ -32,7 +32,7 @@ ingress:
enabled: "true" enabled: "true"
ingressClassName: "traefik" ingressClassName: "traefik"
annotations: annotations:
traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-crowdsec@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd" traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd"
traefik.ingress.kubernetes.io/router.entrypoints: "websecure" traefik.ingress.kubernetes.io/router.entrypoints: "websecure"
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/name: "Grafana" gethomepage.dev/name: "Grafana"

4
stacks/monitoring/modules/monitoring/prometheus_chart_values.tpl
View file

@ -15,7 +15,7 @@ alertmanager:
enabled: true enabled: true
ingressClassName: "traefik" ingressClassName: "traefik"
annotations: annotations:
traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-crowdsec@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd" traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd"
traefik.ingress.kubernetes.io/router.entrypoints: "websecure" traefik.ingress.kubernetes.io/router.entrypoints: "websecure"
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/name: "Alertmanager" gethomepage.dev/name: "Alertmanager"
@ -399,7 +399,7 @@ server:
enabled: true enabled: true
ingressClassName: "traefik" ingressClassName: "traefik"
annotations: annotations:
traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-crowdsec@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd" traefik.ingress.kubernetes.io/router.middlewares: "traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd"
traefik.ingress.kubernetes.io/router.entrypoints: "websecure" traefik.ingress.kubernetes.io/router.entrypoints: "websecure"
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"

4
stacks/owntracks/main.tf
View file

@ -49,7 +49,7 @@ resource "kubernetes_namespace" "owntracks" {
name = "owntracks" name = "owntracks"
labels = { labels = {
"istio-injection" : "disabled" "istio-injection" : "disabled"
tier = local.tiers.aux tier = local.tiers.aux
"keel.sh/enrolled" = "true" "keel.sh/enrolled" = "true"
} }
} }
@ -249,7 +249,7 @@ module "ingress" {
tls_secret_name = var.tls_secret_name tls_secret_name = var.tls_secret_name
port = 80 port = 80
extra_annotations = { extra_annotations = {
"traefik.ingress.kubernetes.io/router.middlewares" = "owntracks-basic-auth@kubernetescrd,traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd,traefik-crowdsec@kubernetescrd" "traefik.ingress.kubernetes.io/router.middlewares" = "owntracks-basic-auth@kubernetescrd,traefik-rate-limit@kubernetescrd,traefik-csp-headers@kubernetescrd"
"gethomepage.dev/enabled" = "true" "gethomepage.dev/enabled" = "true"
"gethomepage.dev/name" = "OwnTracks" "gethomepage.dev/name" = "OwnTracks"
"gethomepage.dev/description" = "Location tracking" "gethomepage.dev/description" = "Location tracking"

1
stacks/reverse-proxy/modules/reverse_proxy/factory/main.tf
View file

@ -211,7 +211,6 @@ resource "kubernetes_ingress_v1" "proxied-ingress" {
"traefik-retry@kubernetescrd", "traefik-retry@kubernetescrd",
var.skip_global_rate_limit ? null : "traefik-rate-limit@kubernetescrd", var.skip_global_rate_limit ? null : "traefik-rate-limit@kubernetescrd",
var.custom_content_security_policy == null ? "traefik-csp-headers@kubernetescrd" : null, var.custom_content_security_policy == null ? "traefik-csp-headers@kubernetescrd" : null,
"traefik-crowdsec@kubernetescrd",
var.protected ? "traefik-authentik-forward-auth@kubernetescrd" : null, var.protected ? "traefik-authentik-forward-auth@kubernetescrd" : null,
var.strip_auth_headers ? "traefik-strip-auth-headers@kubernetescrd" : null, var.strip_auth_headers ? "traefik-strip-auth-headers@kubernetescrd" : null,
var.custom_content_security_policy != null ? "${var.namespace}-custom-csp-${var.name}@kubernetescrd" : null, var.custom_content_security_policy != null ? "${var.namespace}-custom-csp-${var.name}@kubernetescrd" : null,

12
stacks/reverse-proxy/modules/reverse_proxy/main.tf
View file

@ -31,11 +31,11 @@ module "tls_secret" {
# https://pfsense.viktorbarzin.me/ # https://pfsense.viktorbarzin.me/
module "pfsense" { module "pfsense" {
source = "./factory" source = "./factory"
dns_type = "proxied" dns_type = "proxied"
name = "pfsense" name = "pfsense"
external_name = "pfsense.viktorbarzin.lan" external_name = "pfsense.viktorbarzin.lan"
tls_secret_name = var.tls_secret_name tls_secret_name = var.tls_secret_name
# webGUI moved to :8443 on 2026-06-10 — :443 on pfSense is now the # webGUI moved to :8443 on 2026-06-10 — :443 on pfSense is now the
# SNI-routed HAProxy frontend (hostname->Traefik, no-SNI->GUI). Direct # SNI-routed HAProxy frontend (hostname->Traefik, no-SNI->GUI). Direct
# backend port avoids a Traefik->HAProxy->GUI double hop. # backend port avoids a Traefik->HAProxy->GUI double hop.
@ -163,7 +163,7 @@ module "docker-registry-ui" {
depends_on = [kubernetes_namespace.reverse-proxy] depends_on = [kubernetes_namespace.reverse-proxy]
extra_annotations = { extra_annotations = {
# Override middleware chain to remove rate-limit; the UI fires many API calls to list repos/tags # Override middleware chain to remove rate-limit; the UI fires many API calls to list repos/tags
"traefik.ingress.kubernetes.io/router.middlewares" = "traefik-csp-headers@kubernetescrd,traefik-crowdsec@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd" "traefik.ingress.kubernetes.io/router.middlewares" = "traefik-csp-headers@kubernetescrd,traefik-authentik-forward-auth@kubernetescrd"
"gethomepage.dev/enabled" = "true" "gethomepage.dev/enabled" = "true"
"gethomepage.dev/name" = "Docker Registry" "gethomepage.dev/name" = "Docker Registry"
"gethomepage.dev/description" = "Container registry" "gethomepage.dev/description" = "Container registry"