WIP: Update for compatibility with new symfony containers #51

Draft
vcarroy wants to merge 4 commits from rm-default-configs into unstable
7 changed files with 23 additions and 50 deletions

View File

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: hydra-oidc-php-fpm - name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6 image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.4.18-symfonycontainerupdate.1522.1637e19
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
@ -45,6 +45,9 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-oidc-env name: hydra-oidc-env
volumeMounts:
- name: oidc-tmp
mountPath: /tmp
resources: {} resources: {}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
@ -52,7 +55,7 @@ spec:
runAsUser: 1000 runAsUser: 1000
- name: hydra-oidc-caddy - name: hydra-oidc-caddy
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6 image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.4.18-symfonycontainerupdate.1522.1637e19
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
[ [
@ -100,3 +103,7 @@ spec:
runAsGroup: 1000 runAsGroup: 1000
runAsUser: 1000 runAsUser: 1000
restartPolicy: Always restartPolicy: Always
volumes:
- name: oidc-tmp
emptyDir:
medium: Memory

View File

@ -1,7 +0,0 @@
sql_login:
login_column_name: mail
password_column_name: password
salt_column_name: salt
table_name: user
data_to_fetch:
- mail

View File

@ -27,9 +27,6 @@ configMapGenerator:
- ALTCHA_HOST=http://altcha:3333 - ALTCHA_HOST=http://altcha:3333
- ALTCHA_BASE_URL=/altcha - ALTCHA_BASE_URL=/altcha
- ALTCHA_ENABLED=true - ALTCHA_ENABLED=true
- name: sql-login-config
files:
- ./files/sql_login.yaml
- name: hydra-sql-php-ini - name: hydra-sql-php-ini
files: files:
- ./files/03_base.ini - ./files/03_base.ini

View File

@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: hydra-sql-fpm - name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.15-develop.1007.945a558 image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.17-symfonycontainerupdate.1254.0de370a
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
@ -60,15 +60,14 @@ spec:
- name: OPCACHE_REVALIDATE_FREQ - name: OPCACHE_REVALIDATE_FREQ
value: "0" value: "0"
volumeMounts: volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
subPath: "sql_login.yaml"
- name: hydra-sql-php-ini - name: hydra-sql-php-ini
mountPath: /etc/php81/conf.d/03_base.ini mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini subPath: 03_base.ini
- name: sql-tmp
mountPath: /tmp
- name: hydra-sql-caddy - name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.15-develop.1007.945a558 image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.17-symfonycontainerupdate.1254.0de370a
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"] args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe: readinessProbe:
@ -107,16 +106,12 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http name: http
volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
subPath: "sql_login.yaml"
volumes: volumes:
- name: sql-login-config
configMap:
name: sql-login-config
- name: hydra-sql-php-ini - name: hydra-sql-php-ini
configMap: configMap:
name: hydra-sql-php-ini name: hydra-sql-php-ini
- name: sql-tmp
emptyDir:
medium: Memory
restartPolicy: Always restartPolicy: Always

View File

@ -1,16 +0,0 @@
parameters:
env(HYDRA_DISPATCHER_WEBHOOK_ENABLED): false
env(HYDRA_DISPATCHER_WEBHOOK_API_URL): ""
env(HYDRA_DISPATCHER_WEBHOOK_API_KEY): ""
env(HYDRA_DISPATCHER_WEBHOOK_API_METHOD): POST
env(HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES): true
hydra:
apps: []
webhook:
enabled: "%env(bool:HYDRA_DISPATCHER_WEBHOOK_ENABLED)%"
api_url: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_URL)%"
api_key: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_KEY)%"
api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
webhook_post_login:
enabled: false

View File

@ -26,9 +26,6 @@ configMapGenerator:
- DEFAULT_LOCALE=fr - DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en - APP_LOCALES=fr,en
- REDIS_DSN="redis://redis:6379" - REDIS_DSN="redis://redis:6379"
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini - name: hydra-dispatcher-php-ini
files: files:
- ./files/03_base.ini - ./files/03_base.ini

View File

@ -19,7 +19,7 @@ spec:
spec: spec:
containers: containers:
- name: hydra-dispatcher-php-fpm - name: hydra-dispatcher-php-fpm
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.4.18-symfonycontainerupdate.1413.9f67e58
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
exec: exec:
@ -50,18 +50,18 @@ spec:
- configMapRef: - configMapRef:
name: hydra-dispatcher-env name: hydra-dispatcher-env
volumeMounts: volumeMounts:
- mountPath: /app/config/hydra
name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini - name: hydra-dispatcher-php-ini
mountPath: /etc/php81/conf.d/03_base.ini mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini subPath: 03_base.ini
- name: dispatcher-tmp
mountPath: /tmp
resources: {} resources: {}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
runAsGroup: 1000 runAsGroup: 1000
runAsUser: 1000 runAsUser: 1000
- name: hydra-dispatcher-caddy - name: hydra-dispatcher-caddy
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.4.18-symfonycontainerupdate.1413.9f67e58
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
[ [
@ -110,9 +110,9 @@ spec:
runAsUser: 1000 runAsUser: 1000
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: hydra-dispatcher-apps
configMap:
name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini - name: hydra-dispatcher-php-ini
configMap: configMap:
name: hydra-dispatcher-php-ini name: hydra-dispatcher-php-ini
- name: dispatcher-tmp
emptyDir:
medium: Memory