From 220cbe642aeca904844f872847069abf03d97cc7 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Mon, 12 Jan 2026 10:46:39 +0100 Subject: [PATCH 1/2] ci: added ci variables to define pod resources + added staging-resources.yaml --- manifest.yaml | 14 ++++++++++++++ staging-resources.yaml | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 staging-resources.yaml diff --git a/manifest.yaml b/manifest.yaml index 226341b..6972cb7 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -66,6 +66,13 @@ spec: envFrom: - configMapRef: name: ${CI_PROJECT_PATH_SLUG}-config-map + resources: + limits: + cpu: "${APP_CI_CPU_LIMIT}" + memory: "${APP_CI_MEMORY_LIMIT}" + requests: + cpu: "${APP_CI_CPU_REQUEST}" + memory: "${APP_CI_MEMORY_REQUEST}" volumeMounts: - name: storage mountPath: /app/srcs/storage @@ -80,6 +87,13 @@ spec: "-c", "kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done", ] + resources: + limits: + cpu: "${APP_CI_CPU_LIMIT}" + memory: "${APP_CI_MEMORY_LIMIT}" + requests: + cpu: "${APP_CI_CPU_REQUEST}" + memory: "${APP_CI_MEMORY_REQUEST}" command: - "bash" args: diff --git a/staging-resources.yaml b/staging-resources.yaml new file mode 100644 index 0000000..a1cd413 --- /dev/null +++ b/staging-resources.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: ${CI_PROJECT_PATH_SLUG}-ingress-route +spec: + entryPoints: + - web + - websecure + routes: + - match: Host(`${APP_DOMAIN}`) + kind: Rule + services: + - name: ${CI_PROJECT_PATH_SLUG}-service + port: 80 + middlewares: + - name: admin-ldc-whitelist + namespace: common-services + tls: + secretName: ${CRT_TLS_NAME} From cef4f9764c584b12279aff227f6b01358d52084f Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Mon, 12 Jan 2026 11:29:21 +0100 Subject: [PATCH 2/2] feat: updated admin-secure --- .env.example | 6 ++++++ composer.json | 2 +- composer.lock | 18 +++++++++--------- manifest.yaml | 2 ++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index 2d0e31f..2c70686 100644 --- a/.env.example +++ b/.env.example @@ -42,3 +42,9 @@ SAML2_SP_CERT_x509= SAML2_SP_CERT_PRIVATEKEY= SAML2_CONTACT_TECHNICAL_EMAIL= SAML2_CONTACT_SUPPORT_EMAIL= + +# UWIL ADMIN SECURE +# - LIST SEPARATED WITH ',' (Required) +UWIL_ADMIN_SECURE_CIDR_LIST="" +# - LIST SEPARATED WITH ',' (Optional) +UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST="" diff --git a/composer.json b/composer.json index 939bdbb..ed40a21 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "sentry/sentry-laravel": "^4.3", "stancl/tenancy": "^3.9", "usmanhalalit/laracsv": "^2.0", - "uwil/admin-secure-laravel": "^4.0", + "uwil/admin-secure-laravel": "^5.0", "uwil/k8s-laravel": "^2.0", "uwil/laravel-common": "^3.1" }, diff --git a/composer.lock b/composer.lock index c63aa00..56ff13c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0eb882c623bc540ee0defb89f0fb2380", + "content-hash": "95a2e52c4d7dc928740181ef4d8f395a", "packages": [ { "name": "24slides/laravel-saml2", @@ -8579,16 +8579,16 @@ }, { "name": "uwil/admin-secure-laravel", - "version": "4.0.0", + "version": "5.0.0", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/ldc-web-admin-secure-laravel.git", - "reference": "26f818b6b9251090fa5960a40750716e4fdbbe9d" + "reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=26f818b6b9251090fa5960a40750716e4fdbbe9d", - "reference": "26f818b6b9251090fa5960a40750716e4fdbbe9d", + "url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=7d9c052db4318752a312dc9763bc8c31ea053aa2", + "reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2", "shasum": "" }, "require": { @@ -8637,7 +8637,7 @@ ], "description": "Restrict access to LDC Network", "support": { - "email": "equipe.web@ldc.fr", + "email": "digital@ldc.fr", "issues": "https://lab.s-web.fr/ldc-web/projets/ldc-web-admin-secure-laravel/-/issues" } }, @@ -12059,12 +12059,12 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.3" }, - "platform-dev": {}, - "plugin-api-version": "2.6.0" + "platform-dev": [], + "plugin-api-version": "2.3.0" } diff --git a/manifest.yaml b/manifest.yaml index 6972cb7..a24f021 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -33,6 +33,8 @@ data: SAML2_CONTACT_TECHNICAL_EMAIL: "${APP_SAML2_CONTACT_TECHNICAL_EMAIL}" SAML2_CONTACT_SUPPORT_EMAIL: "${APP_SAML2_CONTACT_SUPPORT_EMAIL}" SAML2_DEFAULT_TENANT_UUID: "${APP_SAML2_DEFAULT_TENANT_UUID}" + UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}" + --- apiVersion: v1 kind: PersistentVolumeClaim