diff --git a/infrastructure/traefik/helm-release.yaml b/infrastructure/traefik/helm-release.yaml index b895fa1..0bb6add 100644 --- a/infrastructure/traefik/helm-release.yaml +++ b/infrastructure/traefik/helm-release.yaml @@ -28,6 +28,8 @@ spec: - "--accesslog=true" - "--entryPoints.web.http.redirections.entryPoint.to=websecure" - "--entrypoints.web.http.redirections.entrypoint.scheme=https" + - "--entryPoints.web.http.middlewares=ip-blacklist-bots@kubernetescrd" + - "--entryPoints.websecure.http.middlewares=ip-blacklist-bots@kubernetescrd" - "--providers.kubernetescrd.allowCrossNamespace=true" - "--entryPoints.web.proxyProtocol.trustedIPs=${TRAEFIK_LOAD_BALANCER_IP}/32,10.124.0.0/16" - "--entryPoints.websecure.proxyProtocol.trustedIPs=${TRAEFIK_LOAD_BALANCER_IP}/32,10.124.0.0/16" @@ -215,7 +217,7 @@ spec: name: ipwhitelist-acces-mariadb namespace: common-services spec: - ipWhiteList: + ipAllowList: sourceRange: - 46.18.126.208/28 # LDC - 62.193.56.48/32 # OPENevents - Bureau Neuville @@ -226,13 +228,61 @@ spec: - 151.80.95.176/28 # LDC - 217.15.92.64/28 # LDC - 10.124.0.0/16 # Kubernetes internal resources + + - apiVersion: traefik.io/v1alpha1 + kind: Middleware + metadata: + name: ip-blacklist-bots + namespace: common-services + spec: + ipAllowList: + sourceRange: + - 0.0.0.0/0 + ipStrategy: + excludedIPs: + - 52.230.152.0/24 + - 52.233.106.0/24 + - 20.171.206.0/24 + - 20.171.207.0/24 + - 4.227.36.0/25 + - 20.125.66.80/28 + - 172.182.193.160/28 + - 157.55.39.0/24 + - 207.46.13.0/24 + - 40.77.167.0/24 + - 13.66.139.0/24 + - 13.66.144.0/24 + - 52.167.144.0/24 + - 13.67.10.16/28 + - 13.69.66.240/28 + - 13.71.172.224/28 + - 139.217.52.0/28 + - 191.233.204.224/28 + - 20.36.108.32/28 + - 20.43.120.16/28 + - 40.79.131.208/28 + - 40.79.186.176/28 + - 52.231.148.0/28 + - 20.79.107.240/28 + - 51.105.67.0/28 + - 20.125.163.80/28 + - 40.77.188.0/22 + - 65.55.210.0/24 + - 199.30.24.0/23 + - 40.77.202.0/24 + - 40.77.139.0/25 + - 20.74.197.0/28 + - 20.15.133.160/27 + - 40.77.177.0/24 + - 40.77.178.0/23 + - apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: admin-ldc-whitelist namespace: common-services spec: - ipWhiteList: + ipAllowList: sourceRange: - 46.18.126.208/28 # LDC - 62.193.56.48/32 # OPENevents - Bureau Neuville