Compare commits
1 Commits
unstable
...
add-hydra-
Author | SHA1 | Date | |
---|---|---|---|
9dc6daea52 |
@ -18,7 +18,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-oidc-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.5.12-develop.1308.4d1b0a4
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
@ -45,9 +45,6 @@ spec:
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-oidc-env
|
||||
volumeMounts:
|
||||
- name: oidc-tmp
|
||||
mountPath: /tmp
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
@ -55,7 +52,7 @@ spec:
|
||||
runAsUser: 1000
|
||||
|
||||
- name: hydra-oidc-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.5.12-develop.1308.4d1b0a4
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
|
||||
imagePullPolicy: IfNotPresent
|
||||
args:
|
||||
[
|
||||
@ -103,7 +100,3 @@ spec:
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: oidc-tmp
|
||||
emptyDir:
|
||||
medium: Memory
|
||||
|
@ -20,3 +20,11 @@ hydra:
|
||||
eduPersonAffiliation:
|
||||
rules:
|
||||
- "property_exists(consent.session.id_token, 'eduPersonAffiliation') ? consent.session.id_token.eduPersonAffiliation : null"
|
||||
firewall:
|
||||
rules:
|
||||
email:
|
||||
required: false
|
||||
uid:
|
||||
required: false
|
||||
eduPersonAffiliation:
|
||||
required: false
|
||||
|
7
components/hydra-sql/files/sql_login.yaml
Normal file
7
components/hydra-sql/files/sql_login.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
sql_login:
|
||||
login_column_name: mail
|
||||
password_column_name: password
|
||||
salt_column_name: salt
|
||||
table_name: user
|
||||
data_to_fetch:
|
||||
- mail
|
@ -24,9 +24,9 @@ configMapGenerator:
|
||||
- DB_PASSWORD="makeMeASecret"
|
||||
- REDIS_DSN="redis://redis:6379"
|
||||
- PEPPER="MakeMeABigSecret"
|
||||
- ALTCHA_HOST=http://altcha:3333
|
||||
- ALTCHA_BASE_URL=/altcha
|
||||
- ALTCHA_ENABLED=true
|
||||
- name: sql-login-config
|
||||
files:
|
||||
- ./files/sql_login.yaml
|
||||
- name: hydra-sql-php-ini
|
||||
files:
|
||||
- ./files/03_base.ini
|
||||
|
@ -21,7 +21,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-sql-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.5.12-develop.1303.64d1c1c
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.3.7-develop.1415.7239d84
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
@ -60,14 +60,15 @@ spec:
|
||||
- name: OPCACHE_REVALIDATE_FREQ
|
||||
value: "0"
|
||||
volumeMounts:
|
||||
- name: sql-login-config
|
||||
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
|
||||
subPath: "sql_login.yaml"
|
||||
- name: hydra-sql-php-ini
|
||||
mountPath: /etc/php81/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.5.12-develop.1303.64d1c1c
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.3.7-develop.1415.7239d84
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
|
||||
readinessProbe:
|
||||
@ -106,12 +107,16 @@ spec:
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: http
|
||||
volumeMounts:
|
||||
- name: sql-login-config
|
||||
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
|
||||
subPath: "sql_login.yaml"
|
||||
volumes:
|
||||
- name: sql-login-config
|
||||
configMap:
|
||||
name: sql-login-config
|
||||
- name: hydra-sql-php-ini
|
||||
configMap:
|
||||
name: hydra-sql-php-ini
|
||||
- name: sql-tmp
|
||||
emptyDir:
|
||||
medium: Memory
|
||||
|
||||
restartPolicy: Always
|
||||
|
@ -25,6 +25,17 @@ hydra:
|
||||
email:
|
||||
rules:
|
||||
- "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
|
||||
firewall:
|
||||
additional_properties: true
|
||||
rules:
|
||||
siret:
|
||||
required: false
|
||||
email:
|
||||
required: false
|
||||
given_name:
|
||||
required: false
|
||||
family_name:
|
||||
required: false
|
||||
webhook:
|
||||
enabled: false
|
||||
webhook_post_login:
|
||||
|
19
resources/hydra-dispatcher/files/hydra/default.yaml
Normal file
19
resources/hydra-dispatcher/files/hydra/default.yaml
Normal file
@ -0,0 +1,19 @@
|
||||
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)%"
|
||||
firewall:
|
||||
additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
|
||||
rules: {}
|
||||
webhook_post_login:
|
||||
enabled: false
|
@ -26,6 +26,12 @@ configMapGenerator:
|
||||
- DEFAULT_LOCALE=fr
|
||||
- APP_LOCALES=fr,en
|
||||
- REDIS_DSN="redis://redis:6379"
|
||||
- LOGGER_LEVEL=info
|
||||
- PHP_FPM_DISPLAY_ERRORS=on
|
||||
- PHP_FPM_CATCH_WORKERS_OUTPUT=1
|
||||
- name: hydra-dispatcher-apps
|
||||
files:
|
||||
- apps.yaml=./files/hydra/default.yaml
|
||||
- name: hydra-dispatcher-php-ini
|
||||
files:
|
||||
- ./files/03_base.ini
|
@ -19,7 +19,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-dispatcher-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.5.12-develop.1306.a249b62
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
exec:
|
||||
@ -50,18 +50,18 @@ spec:
|
||||
- configMapRef:
|
||||
name: hydra-dispatcher-env
|
||||
volumeMounts:
|
||||
- mountPath: /app/config/hydra
|
||||
name: hydra-dispatcher-apps
|
||||
- name: hydra-dispatcher-php-ini
|
||||
mountPath: /etc/php81/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.5.12-develop.1306.a249b62
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
|
||||
imagePullPolicy: IfNotPresent
|
||||
args:
|
||||
[
|
||||
@ -110,9 +110,9 @@ spec:
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: hydra-dispatcher-apps
|
||||
configMap:
|
||||
name: hydra-dispatcher-apps
|
||||
- name: hydra-dispatcher-php-ini
|
||||
configMap:
|
||||
name: hydra-dispatcher-php-ini
|
||||
- name: dispatcher-tmp
|
||||
emptyDir:
|
||||
medium: Memory
|
||||
|
Loading…
x
Reference in New Issue
Block a user