Merge pull request 'feat(FC2) : update hydra-oidc for fc2 compatibility' (#71) from fc2 into unstable

Reviewed-on: #71

components/hydra-oidc/resources/hydra-oidc-deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - 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.7-develop.951.64b13e8
         imagePullPolicy: IfNotPresent
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
@@ -52,7 +52,7 @@ spec:
           runAsUser: 1000
 
       - 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.7-develop.951.64b13e8
         imagePullPolicy: IfNotPresent
         args:
           [

components/hydra-sql/files/sql_login.yaml

@@ -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

components/hydra-sql/kustomization.yaml

@@ -27,6 +27,9 @@ configMapGenerator:
   - 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

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -60,6 +60,9 @@ 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
@@ -104,7 +107,14 @@ 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

resources/hydra-dispatcher/files/hydra/default.yaml

@@ -0,0 +1,16 @@
+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

resources/hydra-dispatcher/kustomization.yaml

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

resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml

@@ -50,6 +50,8 @@ 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
@@ -108,6 +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