diff --git a/adguardhome/k8s/ingress.yaml b/adguardhome/k8s/ingress.yaml index 86cf3e2..01761cb 100644 --- a/adguardhome/k8s/ingress.yaml +++ b/adguardhome/k8s/ingress.yaml @@ -10,14 +10,16 @@ spec: - match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: adguard-service port: 3000 - match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: adguard-service port: 3000 @@ -39,3 +41,7 @@ spec: - name: adguard-service port: 3000 - match: (Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`) || Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)) && PathPrefix(`/dns-query`) + kind: Rule + services: + - name: adguard-service + port: 3000 diff --git a/authentik/k8s/ingress.yaml b/authentik/k8s/ingress.yaml index c25087b..991f0ea 100644 --- a/authentik/k8s/ingress.yaml +++ b/authentik/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`auth.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: authentik-server-service port: 9000 diff --git a/checkmk/k8s/ingress.yaml b/checkmk/k8s/ingress.yaml index 9b6b46c..e1efbc0 100644 --- a/checkmk/k8s/ingress.yaml +++ b/checkmk/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`cmk.forust.xyz`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: checkmk-service port: 5000 diff --git a/dockmon/k8s/ingress.yaml b/dockmon/k8s/ingress.yaml index 99e10c5..bbaffeb 100644 --- a/dockmon/k8s/ingress.yaml +++ b/dockmon/k8s/ingress.yaml @@ -18,7 +18,8 @@ spec: - match: Host(`dockmon.forust.xyz`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec - name: security-headers@file services: - name: dockmon-service diff --git a/gitea/k8s/ingress.yaml b/gitea/k8s/ingress.yaml index 9d8588d..de80195 100644 --- a/gitea/k8s/ingress.yaml +++ b/gitea/k8s/ingress.yaml @@ -10,14 +10,16 @@ spec: - match: Host(`gitea.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: gitea-service port: 3000 - match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: gitea-service port: 3000 diff --git a/headscale/k8s/ingress.yaml b/headscale/k8s/ingress.yaml index 4f4e877..918428c 100644 --- a/headscale/k8s/ingress.yaml +++ b/headscale/k8s/ingress.yaml @@ -19,21 +19,24 @@ spec: - match: Host(`hs.forust.xyz`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: headscale-server-external port: 8080 - match: Host(`hs.forust.xyz`) && PathPrefix(`/admin`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: headscale-ui-external port: 80 - match: Host(`hs.forust.xyz`) && PathPrefix(`/metrics`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: headscale-server-external port: 9090 @@ -53,7 +56,8 @@ spec: kind: Rule middlewares: - name: headplane-prefix - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: headplane-external port: 3000 diff --git a/homepages/k8s/ingress.yaml b/homepages/k8s/ingress.yaml index ab6c15a..0b17b38 100644 --- a/homepages/k8s/ingress.yaml +++ b/homepages/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`forust.xyz`) || Host(`www.forust.xyz`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec priority: 10 services: - name: forust-homepage-service @@ -46,7 +47,8 @@ spec: - match: Host(`xdfnx.cfd`) || Host(`www.xdfnx.cfd`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: xdfnx-homepage-service port: 80 diff --git a/n8n/k8s/ingress.yaml b/n8n/k8s/ingress.yaml index 7c4d7b6..ee875e7 100644 --- a/n8n/k8s/ingress.yaml +++ b/n8n/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`n8n.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: n8n-service port: 5678 diff --git a/netronome/k8s/ingress.yaml b/netronome/k8s/ingress.yaml index 970490a..9382ff4 100644 --- a/netronome/k8s/ingress.yaml +++ b/netronome/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`nm.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: netronome-service port: 7575 diff --git a/nextcloud/k8s/ingress.yaml b/nextcloud/k8s/ingress.yaml index 62f140c..1f5c78f 100644 --- a/nextcloud/k8s/ingress.yaml +++ b/nextcloud/k8s/ingress.yaml @@ -12,7 +12,8 @@ spec: kind: Rule middlewares: - name: nextcloud-chain@file - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: nextcloud-apache port: 11000 @@ -31,7 +32,8 @@ spec: - match: Host(`nextcloud.workstation.internal`) || Host(`nextcloud.gigaforust.internal`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec - name: nextcloud-chain@file services: - name: nextcloud-apache diff --git a/portainer/k8s/ingress.yaml b/portainer/k8s/ingress.yaml index f1acace..c928c2d 100644 --- a/portainer/k8s/ingress.yaml +++ b/portainer/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`portainer.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: portainer-service port: 9000 diff --git a/prometheus-stack/k8s/ingress.yaml b/prometheus-stack/k8s/ingress.yaml index bee1f73..5f2da35 100644 --- a/prometheus-stack/k8s/ingress.yaml +++ b/prometheus-stack/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`grafana.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec - name: "security-chain@file" services: - name: prometheus-stack-grafana diff --git a/searxng/k8s/ingress.yaml b/searxng/k8s/ingress.yaml index 5c598f8..faa7a46 100644 --- a/searxng/k8s/ingress.yaml +++ b/searxng/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`s.forust.xyz`) || Host(`search.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: searxng-service port: 8080 diff --git a/termix/k8s/ingress.yaml b/termix/k8s/ingress.yaml index abe72ee..4104519 100644 --- a/termix/k8s/ingress.yaml +++ b/termix/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`termix.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: termix-service port: 8080 diff --git a/traefik/k8s/ingress.yaml b/traefik/k8s/ingress.yaml index e957454..b4c6594 100644 --- a/traefik/k8s/ingress.yaml +++ b/traefik/k8s/ingress.yaml @@ -11,7 +11,8 @@ spec: - match: Host(`traefik.forust.xyz`) kind: Rule middlewares: - - name: "crowdsec-crowdsec-bouncer@kubernetescrd" + - name: crowdsec-bouncer + namespace: crowdsec services: - name: api@internal kind: TraefikService diff --git a/uptime-kuma/k8s/ingress.yaml b/uptime-kuma/k8s/ingress.yaml index 189dfd7..fc5cc5c 100644 --- a/uptime-kuma/k8s/ingress.yaml +++ b/uptime-kuma/k8s/ingress.yaml @@ -10,7 +10,8 @@ spec: - match: Host(`uptime.forust.xyz`) kind: Rule middlewares: - - name: crowdsec-crowdsec-bouncer@kubernetescrd + - name: crowdsec-bouncer + namespace: crowdsec services: - name: uptime-kuma-service port: 3001