From 60b5a936cc72ba74e350dac41244f17fa9e599ac Mon Sep 17 00:00:00 2001 From: Gauthier DUPONT Date: Mon, 13 Oct 2025 14:44:46 +0200 Subject: [PATCH] feat(frankenphp): configure frankenphp and remove phpfpm --- .../resources/hydra-oidc-deployment.yaml | 37 --------------- .../resources/hydra-sql-deployment.yaml | 46 ------------------- .../hydra-dispatcher-deployment.yaml | 42 ----------------- 3 files changed, 125 deletions(-) diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml index 9c19848..96fb861 100644 --- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml @@ -17,43 +17,6 @@ spec: app.kubernetes.io/name: hydra-oidc spec: containers: - - name: hydra-oidc-php-fpm - image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382 - imagePullPolicy: IfNotPresent - args: ["/usr/sbin/php-fpm81", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php81/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - php - - bin/console - - -V - initialDelaySeconds: 10 - periodSeconds: 30 - env: - - name: PHP_FPM_LISTEN - value: 127.0.0.1:9000 - - name: PHP_MEMORY_LIMIT - value: 128m - - name: PHP_FPM_MEMORY_LIMIT - value: 128m - envFrom: - - configMapRef: - name: hydra-oidc-env - volumeMounts: - - name: oidc-tmp - mountPath: /tmp - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - - name: hydra-oidc-caddy image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382 imagePullPolicy: IfNotPresent diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index 1d67286..6d3ec15 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -20,52 +20,6 @@ spec: app.kubernetes.io/name: hydra-sql spec: containers: - - name: hydra-sql-fpm - image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c - imagePullPolicy: IfNotPresent - args: ["/usr/sbin/php-fpm84", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php84/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - php - - bin/console - - -V - initialDelaySeconds: 10 - periodSeconds: 30 - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - envFrom: - - configMapRef: - name: hydra-sql-env - env: - - name: PHP_FPM_LISTEN - value: 127.0.0.1:9000 - - name: PHP_MEMORY_LIMIT - value: 128m - - name: PHP_FPM_MEMORY_LIMIT - value: 128m - - name: PHP_FPM_LOG_LEVEL - value: warning - - name: OPCACHE_VALIDATE_TIMESTAMP - value: "0" - - name: OPCACHE_REVALIDATE_FREQ - value: "0" - volumeMounts: - - name: hydra-sql-php-ini - mountPath: /etc/php84/conf.d/03_base.ini - subPath: 03_base.ini - - name: sql-tmp - mountPath: /tmp - - name: hydra-sql-caddy image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c imagePullPolicy: IfNotPresent diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml index 73d18d2..310903a 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml @@ -18,48 +18,6 @@ spec: app.kubernetes.io/name: hydra-dispatcher spec: containers: - - name: hydra-dispatcher-php-fpm - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb - args: ["/usr/sbin/php-fpm84", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php84/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - php - - bin/console - - -V - initialDelaySeconds: 10 - periodSeconds: 30 - env: - - name: PHP_FPM_LISTEN - value: 127.0.0.1:9000 - - name: PHP_MEMORY_LIMIT - value: 128m - - name: PHP_FPM_MEMORY_LIMIT - value: 128m - - name: OPCACHE_VALIDATE_TIMESTAMP - value: "0" - - name: OPCACHE_REVALIDATE_FREQ - value: "0" - envFrom: - - configMapRef: - name: hydra-dispatcher-env - volumeMounts: - - name: hydra-dispatcher-php-ini - mountPath: /etc/php84/conf.d/03_base.ini - subPath: 03_base.ini - - name: dispatcher-tmp - mountPath: /tmp - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - name: hydra-dispatcher-caddy image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb imagePullPolicy: IfNotPresent