Compare commits

..

1 commit

Author SHA1 Message Date
Bot Auto Deploy
4aed5f2a2f Bot Auto Commit 2026-09-10 08:40:56 +00:00
7 changed files with 115 additions and 63 deletions

View file

@ -2,7 +2,6 @@ ci_access:
projects: projects:
- id: ldc-web/projets/agis - id: ldc-web/projets/agis
- id: ldc-web/projets/auguste-lambert - id: ldc-web/projets/auguste-lambert
- id: ldc-web/projets/barfid
- id: ldc-web/projets/bien-etre-animal - id: ldc-web/projets/bien-etre-animal
- id: ldc-web/projets/boutique-cnc-sable - id: ldc-web/projets/boutique-cnc-sable
- id: ldc-web/projets/boutique-jeusselin - id: ldc-web/projets/boutique-jeusselin
@ -13,9 +12,9 @@ ci_access:
- id: ldc-web/projets/domaine-de-lanvaux - id: ldc-web/projets/domaine-de-lanvaux
- id: ldc-web/projets/doux - id: ldc-web/projets/doux
- id: ldc-web/projets/espri-restauration - id: ldc-web/projets/espri-restauration
- id: ldc-web/projets/favid
- id: ldc-web/projets/galina - id: ldc-web/projets/galina
- id: ldc-web/projets/gen-game-web-instances/auguste-lambert - id: ldc-web/projets/gen-game-web-instances/janze
- id: ldc-web/projets/gen-game-web-instances/l-orleanais-jeu
- id: ldc-web/projets/gen-game-web-instances/le-gaulois-eveillez-vos-papilles - id: ldc-web/projets/gen-game-web-instances/le-gaulois-eveillez-vos-papilles
- id: ldc-web/projets/gen-game-web-instances/le-gaulois-tdf-2024 - id: ldc-web/projets/gen-game-web-instances/le-gaulois-tdf-2024
- id: ldc-web/projets/gen-game-web-instances/le-gaulois-chequier-40-2025 - id: ldc-web/projets/gen-game-web-instances/le-gaulois-chequier-40-2025
@ -24,6 +23,7 @@ ci_access:
- id: ldc-web/projets/gen-game-web-instances/le-gaulois-sportif-2026 - id: ldc-web/projets/gen-game-web-instances/le-gaulois-sportif-2026
- id: ldc-web/projets/gen-game-web-instances/matines-40-ans - id: ldc-web/projets/gen-game-web-instances/matines-40-ans
- id: ldc-web/projets/gen-game-web-instances/nature-and-respect - id: ldc-web/projets/gen-game-web-instances/nature-and-respect
- id: ldc-web/projets/gen-game-web-instances/normandie
- id: ldc-web/projets/gen-game-web-instances/reghalal-jeu - id: ldc-web/projets/gen-game-web-instances/reghalal-jeu
- id: ldc-web/projets/gen-game-web-instances/tregalette-chandleur-2024 - id: ldc-web/projets/gen-game-web-instances/tregalette-chandleur-2024
- id: ldc-web/projets/gen-game-web-prize-draw - id: ldc-web/projets/gen-game-web-prize-draw
@ -38,6 +38,7 @@ ci_access:
- id: ldc-web/projets/le-gaulois - id: ldc-web/projets/le-gaulois
- id: ldc-web/projets/le-gaulois-pro - id: ldc-web/projets/le-gaulois-pro
- id: ldc-web/projets/le-marche-de-beaufeu - id: ldc-web/projets/le-marche-de-beaufeu
- id: ldc-web/projets/les-fermiers-snv
- id: ldc-web/projets/lionor - id: ldc-web/projets/lionor
- id: ldc-web/projets/loue - id: ldc-web/projets/loue
- id: ldc-web/projets/matomo - id: ldc-web/projets/matomo

View file

@ -6,7 +6,7 @@ metadata:
namespace: review namespace: review
spec: spec:
dnsNames: dnsNames:
- '*.${REVIEW_DOMAIN_NAME}' - '*.review.re7-s-web.fr'
secretName: wildcard-k8s-ldc secretName: wildcard-k8s-ldc
revisionHistoryLimit: 1 revisionHistoryLimit: 1
issuerRef: issuerRef:
@ -21,7 +21,7 @@ metadata:
namespace: staging namespace: staging
spec: spec:
dnsNames: dnsNames:
- '*.${STAGING_DOMAIN_NAME}' - '*.re7-s-web.fr'
secretName: wildcard-k8s-ldc secretName: wildcard-k8s-ldc
revisionHistoryLimit: 1 revisionHistoryLimit: 1
issuerRef: issuerRef:
@ -36,7 +36,7 @@ metadata:
namespace: production namespace: production
spec: spec:
dnsNames: dnsNames:
- '*.${PRODUCTION_DOMAIN_NAME}' - '*.k8s.s-web.fr'
secretName: wildcard-k8s-ldc secretName: wildcard-k8s-ldc
revisionHistoryLimit: 1 revisionHistoryLimit: 1
issuerRef: issuerRef:

View file

@ -17,7 +17,7 @@ spec:
container_runtime: containerd container_runtime: containerd
image: image:
tag: v1.8.0 tag: v1.7.8
agent: agent:
acquisition: acquisition:
@ -56,7 +56,7 @@ spec:
server: server:
auto_registration: # Activate if not using TLS for authentication auto_registration: # Activate if not using TLS for authentication
enabled: true enabled: true
token: "${CROWDSEC_REGISTRATION_TOKEN}" # /!\ Do not modify this variable (Cluster K8S gitlab var) token: "4inqydLBZ6ErkkVWLCcoVgfXRWj9FAsowvfDoP4mLDrqERje" # /!\ Do not modify this variable (Cluster K8S gitlab var)
allowed_ranges: # /!\ Make sure to adapt to the pod IP ranges used by your cluster allowed_ranges: # /!\ Make sure to adapt to the pod IP ranges used by your cluster
- "127.0.0.1/32" - "127.0.0.1/32"
- "192.168.0.0/16" - "192.168.0.0/16"
@ -64,11 +64,11 @@ spec:
- "172.16.0.0/12" - "172.16.0.0/12"
db_config: db_config:
type: mysql type: mysql
user: ${CROWDSEC_DB_USER} user: crowdsec
password: ${CROWDSEC_DB_PWD} password: +ctk2).oRv]oW2}E$~HxM
db_name: ${CROWDSEC_DB_NAME} db_name: crowdsec
host: ${DB_HOST} host: mysql-e884938b-o403ac517.database.cloud.ovh.net
port: ${DB_PORT} port: 20184
flush: flush:
bouncers_autodelete: bouncers_autodelete:
api_key: 1h api_key: 1h
@ -88,25 +88,5 @@ spec:
labels: labels:
type: appsec type: appsec
env: env:
- name: NO_HUB_UPGRADE
value: "false"
- name: COLLECTIONS - name: COLLECTIONS
value: >- value: "crowdsecurity/appsec-virtual-patching crowdsecurity/appsec-crs crowdsecurity/appsec-generic-rules"
crowdsecurity/appsec-virtual-patching
crowdsecurity/appsec-crs
crowdsecurity/appsec-generic-rules
crowdsecurity/wordpress
crowdsecurity/appsec-crs-exclusion-plugin-wordpress
crowdsecurity/appsec-wordpress
# Volumes to pass the `hub update` and `hub upgrade` tests.
extraVolumes:
- name: hub
emptyDir: {}
- name: data
emptyDir: {}
extraVolumeMounts:
- name: hub
mountPath: /etc/crowdsec/hub
- name: data
mountPath: /var/lib/crowdsec/data

View file

@ -19,9 +19,9 @@ metadata:
spec: spec:
summary: "LDC-WEB K8S NOTIFICATION" summary: "LDC-WEB K8S NOTIFICATION"
eventMetadata: eventMetadata:
env: ${CI_ENVIRONMENT_NAME} env: production
cluster: ${KUBERNETES_SERVER_API} cluster: https://dbbc0v.c1.sbg5.k8s.ovh.net
region: ${KUBERNETES_REGION} region: OVH-SBG5
providerRef: providerRef:
name: msteams name: msteams
eventSeverity: info eventSeverity: info

View file

@ -21,8 +21,6 @@ spec:
gitlabUrl: https://lab.s-web.fr gitlabUrl: https://lab.s-web.fr
concurrent: ${GITLAB_RUNNER_CONCURRENT}
runners: runners:
config: | config: |
[[runners]] [[runners]]
@ -30,10 +28,6 @@ spec:
[runners.kubernetes] [runners.kubernetes]
namespace = "{{.Release.Namespace}}" namespace = "{{.Release.Namespace}}"
image = "alpine" image = "alpine"
cpu_request = "${GITLAB_RUNNER_CPU_REQUEST}"
memory_request = "${GITLAB_RUNNER_MEMORY_REQUEST}"
helper_cpu_request = "${GITLAB_RUNNER_HELPER_CPU_REQUEST}"
helper_memory_request = "${GITLAB_RUNNER_HELPER_MEMORY_REQUEST}"
secret: gitlab-runner-token secret: gitlab-runner-token
metrics: metrics:

View file

@ -47,11 +47,11 @@ spec:
resources: resources:
requests: requests:
cpu: "${NETDATA_PARENT_REQUESTS_CPU}" cpu: "200m"
memory: "${NETDATA_PARENT_REQUESTS_RAM}" memory: "512Mi"
limits: limits:
cpu: "${NETDATA_PARENT_LIMITS_CPU}" cpu: "2"
memory: "${NETDATA_PARENT_LIMITS_RAM}" memory: "2Gi"
# PV parent recommandés (db + alarms) # PV parent recommandés (db + alarms)
database: database:
@ -79,11 +79,11 @@ spec:
resources: resources:
requests: requests:
cpu: "${NETDATA_CHILD_REQUESTS_CPU}" cpu: "100m"
memory: "${NETDATA_CHILD_REQUESTS_RAM}" memory: "256Mi"
limits: limits:
cpu: "${NETDATA_CHILD_LIMITS_CPU}" cpu: "500m"
memory: "${NETDATA_CHILD_LIMITS_RAM}" memory: "512Mi"
persistence: persistence:
enabled: true enabled: true
@ -97,8 +97,8 @@ spec:
data: | data: |
[db] [db]
mode = ram mode = ram
retention = "${NETDATA_CHILD_RETENTION}" retention = "900"
update every = "${NETDATA_CHILD_COLLECT_INTERVAL}" update every = "5"
[web] [web]
bind to = localhost:19999 bind to = localhost:19999
[health] [health]

View file

@ -28,9 +28,9 @@ spec:
- "--entryPoints.web.http.redirections.entryPoint.to=websecure" - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
- "--entrypoints.web.http.redirections.entrypoint.scheme=https" - "--entrypoints.web.http.redirections.entrypoint.scheme=https"
- "--providers.kubernetescrd.allowCrossNamespace=true" - "--providers.kubernetescrd.allowCrossNamespace=true"
- "--entryPoints.web.proxyProtocol.trustedIPs=${OVH_LOAD_BALANCER_EGRESS_IP}/32" - "--entryPoints.web.proxyProtocol.trustedIPs=51.83.34.192/32"
- "--entryPoints.websecure.proxyProtocol.trustedIPs=${OVH_LOAD_BALANCER_EGRESS_IP}/32" - "--entryPoints.websecure.proxyProtocol.trustedIPs=51.83.34.192/32"
- "--entryPoints.websecure.forwardedHeaders.trustedIPs=${OVH_LOAD_BALANCER_EGRESS_IP}/32" - "--entryPoints.websecure.forwardedHeaders.trustedIPs=51.83.34.192/32"
additionalArguments: additionalArguments:
#- "--log.level=DEBUG" #- "--log.level=DEBUG"
@ -122,17 +122,15 @@ spec:
spec: spec:
plugin: plugin:
bouncer: bouncer:
forwardedHeadersTrustedIps: "${OVH_LOAD_BALANCER_EGRESS_IP}/32" forwardedHeadersTrustedIps: "51.83.34.192/32"
enabled: true enabled: true
crowdsecMode: stream crowdsecMode: stream
crowdsecLapiScheme: http crowdsecLapiScheme: http
# Add trailing DOTS in order to prevent systemic DNS query failures crowdsecLapiHost: crowdsec-service.common-services.svc.cluster.local:8080
crowdsecLapiHost: crowdsec-service.common-services.svc.cluster.local.:8080
crowdsecLapiPath: / crowdsecLapiPath: /
crowdsecLapiKeyFile: /etc/traefik/crowdsec/BOUNCER_KEY_traefik crowdsecLapiKeyFile: /etc/traefik/crowdsec/BOUNCER_KEY_traefik
crowdsecAppsecEnabled: true crowdsecAppsecEnabled: true
# Add trailing DOTS in order to prevent systemic DNS query failures crowdsecAppsecHost: crowdsec-appsec-service.common-services.svc.cluster.local:7422
crowdsecAppsecHost: crowdsec-appsec-service.common-services.svc.cluster.local.:7422
crowdsecAppsecPath: / crowdsecAppsecPath: /
crowdsecAppsecFailureBlock: true crowdsecAppsecFailureBlock: true
crowdsecAppsecUnreachableBlock: true crowdsecAppsecUnreachableBlock: true
@ -372,7 +370,6 @@ spec:
- 46.224.188.186 # BugSmash - 46.224.188.186 # BugSmash
- 178.156.178.124 # BugSmash - 178.156.178.124 # BugSmash
- 5.161.29.18 # BugSmash - 5.161.29.18 # BugSmash
- 80.15.14.76 # Mancelle Huttepain
# AJOUT : Service Octavia en parallèle # AJOUT : Service Octavia en parallèle
- apiVersion: v1 - apiVersion: v1
@ -389,7 +386,7 @@ spec:
spec: spec:
type: LoadBalancer type: LoadBalancer
externalTrafficPolicy: Local externalTrafficPolicy: Local
loadBalancerIP: "${TRAEFIK_LOAD_BALANCER_IP_OCTAVIA}" loadBalancerIP: "51.91.209.204"
selector: selector:
app.kubernetes.io/name: traefik app.kubernetes.io/name: traefik
app.kubernetes.io/instance: traefik-common-services app.kubernetes.io/instance: traefik-common-services
@ -402,3 +399,83 @@ spec:
port: 443 port: 443
targetPort: 8443 targetPort: 8443
protocol: TCP protocol: TCP
- apiVersion: v1
kind: Service
metadata:
name: blackhole
namespace: common-services
spec:
# Placeholder : jamais contacté, le middleware renvoie 403 avant.
type: ClusterIP
ports:
- name: http
port: 80
targetPort: 80
- apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
name: deny-ip-blocklist
namespace: common-services
spec:
# ipAllowList rejette en 403
ipAllowList:
sourceRange:
- 192.0.2.1/32 # TEST-NET-1 (RFC 5737) : ne matche aucun client réel => deny
- apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: security-ip-blocklist
namespace: common-services
spec:
entryPoints:
- websecure
routes:
- kind: Rule
match: >-
ClientIP(`45.88.138.45/32`) ||
ClientIP(`8.34.210.32/32`) ||
ClientIP(`8.34.210.37/32`) ||
ClientIP(`8.34.210.42/32`) ||
ClientIP(`8.34.210.43/32`) ||
ClientIP(`8.34.210.45/32`) ||
ClientIP(`34.68.34.65/32`) ||
ClientIP(`34.68.34.66/32`) ||
ClientIP(`34.68.34.67/32`) ||
ClientIP(`34.68.34.69/32`) ||
ClientIP(`34.68.34.71/32`) ||
ClientIP(`34.68.34.72/32`) ||
ClientIP(`34.68.34.77/32`) ||
ClientIP(`34.68.34.79/32`) ||
ClientIP(`34.68.34.81/32`) ||
ClientIP(`34.68.34.84/32`) ||
ClientIP(`94.74.106.96/32`) ||
ClientIP(`20.220.225.223/32`) ||
ClientIP(`52.182.173.140/32`)
priority: 100000
middlewares:
- name: deny-ip-blocklist
namespace: common-services
services:
- name: blackhole
port: 80
- apiVersion: discovery.k8s.io/v1
kind: EndpointSlice
metadata:
name: blackhole
namespace: common-services
labels:
kubernetes.io/service-name: blackhole
addressType: IPv4
endpoints:
- addresses:
- 192.0.2.1 # TEST-NET-1 : non-routable, jamais contacté
conditions:
ready: true
ports:
- name: http
port: 80
protocol: TCP