feat: add xdebug to dispatcher and sql

components/hydra-ldap/kustomization.yaml

@@ -16,7 +16,6 @@ configMapGenerator:
       - WERTHER_LDAP_ENDPOINTS="ldap.test.fr:636"
       - WERTHER_LDAP_IS_TLS=true
       - WERTHER_LDAP_BASEDN="o=test,c=fr"
-      - WERTHER_LDAP_ATTR_CLAIMS="name:name,sn:family_name,givenName:given_name,mail:email"
       - WERTHER_LDAP_ROLE_BASEDN="ou=groups,o=test,c=fr"
       - WERTHER_LDAP_CONNECTION_TIMEOUT="10s"
 

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

@@ -19,7 +19,7 @@ spec:
       containers:
       - name: hydra-oidc-php-fpm
         image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -53,7 +53,7 @@ spec:
 
       - name: hydra-oidc-caddy
         image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         args:
           [
             "/usr/sbin/caddy",

components/hydra-sql/files/50_xdebug.ini

@@ -0,0 +1,8 @@
+# Prevent execution timeout due to the large amount of data to process during profling sessions
+max_execution_time=300
+# Extension
+zend_extension=xdebug.so
+# Xdebug configuration
+xdebug.mode=${XDEBUG_MODE}
+xdebug.client_host=${XDEBUG_CLIENT_HOST}
+xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}

components/hydra-sql/kustomization.yaml

@@ -24,9 +24,16 @@ configMapGenerator:
   - DB_PASSWORD="makeMeASecret"
   - REDIS_DSN="redis://redis:6379"
   - PEPPER="MakeMeABigSecret"
+  - OPCACHE_VALIDATE_TIMESTAMP="0"
+  - OPCACHE_REVALIDATE_FREQ="0"
+  - XDEBUG_MODE=off
 - name: sql-login-config
   files:
   - ./files/sql_login.yaml
 - name: hydra-sql-php-ini
   files:
   - ./files/03_base.ini
+- name: xdebug-sql-config
+  behavior: create
+  files:
+  - ./files/50_xdebug.ini

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

@@ -21,8 +21,8 @@ spec:
     spec:
       containers:
       - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -55,10 +55,6 @@ spec:
           value: 128m
         - name: PHP_FPM_LOG_LEVEL
           value: warning
-        - name: OPCACHE_VALIDATE_TIMESTAMP
-          value: "0"
-        - name: OPCACHE_REVALIDATE_FREQ
-          value: "0"
         volumeMounts:
         - name: sql-login-config
           mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
@@ -66,10 +62,12 @@ spec:
         - name: hydra-sql-php-ini
           mountPath: /etc/php81/conf.d/03_base.ini
           subPath: 03_base.ini
-
+        - name: xdebug-sql-config
+          mountPath: /etc/php81/conf.d/50_xdebug.ini
+          subPath: 50_xdebug.ini
       - name: hydra-sql-caddy
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
         readinessProbe:
           httpGet:
@@ -118,5 +116,7 @@ spec:
       - name: hydra-sql-php-ini
         configMap:
           name: hydra-sql-php-ini
-
+      - name: xdebug-sql-config
+        configMap:
+          name: xdebug-sql-config
       restartPolicy: Always

components/oidc-test/kustomization.yaml

@@ -17,5 +17,4 @@ configMapGenerator:
       - OIDC_REDIRECT_URL=https://example.net/oauth2/callback
       - OIDC_POST_LOGOUT_REDIRECT_URL=https://example.net
       - OIDC_SKIP_ISSUER_VERIFICATION="true"
-      - OIDC_INSECURE_SKIP_VERIFY="true"
+      - OIDC_INSECURE_SKIP_VERIFY="true"
-      - OIDC_SCOPES="openid profile"

resources/hydra-dispatcher/files/50_xdebug.ini

@@ -0,0 +1,8 @@
+# Prevent execution timeout due to the large amount of data to process during profling sessions
+max_execution_time=300
+# Extension
+zend_extension=xdebug.so
+# Xdebug configuration
+xdebug.mode=${XDEBUG_MODE}
+xdebug.client_host=${XDEBUG_CLIENT_HOST}
+xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}

resources/hydra-dispatcher/kustomization.yaml

@@ -26,9 +26,16 @@ configMapGenerator:
   - DEFAULT_LOCALE=fr
   - APP_LOCALES=fr,en
   - REDIS_DSN="redis://redis:6379"
+  - OPCACHE_VALIDATE_TIMESTAMP="0"
+  - OPCACHE_REVALIDATE_FREQ="0"
+  - XDEBUG_MODE=off
 - name: hydra-dispatcher-apps
   files:
   - apps.yaml=./files/hydra/default.yaml
 - name: hydra-dispatcher-php-ini
   files:
-  - ./files/03_base.ini
+  - ./files/03_base.ini
+- name: xdebug-dispatcher-config
+  behavior: create
+  files:
+  - ./files/50_xdebug.ini

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

@@ -41,10 +41,6 @@ spec:
           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
@@ -54,6 +50,9 @@ spec:
         - name: hydra-dispatcher-php-ini
           mountPath: /etc/php81/conf.d/03_base.ini
           subPath: 03_base.ini
+        - name: xdebug-dispatcher-config
+          mountPath: /etc/php81/conf.d/50_xdebug.ini
+          subPath: 50_xdebug.ini
         resources: {}
         securityContext:
           runAsNonRoot: true
@@ -61,16 +60,8 @@ spec:
           runAsUser: 1000
       - name: hydra-dispatcher-caddy
         image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
-        args:
+        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
-          [
-            "/usr/sbin/caddy",
-            "run",
-            "--adapter",
-            "caddyfile",
-            "--config",
-            "/etc/caddy/Caddyfile",
-          ]
         readinessProbe:
           httpGet:
             path: /health
@@ -115,3 +106,6 @@ spec:
       - name: hydra-dispatcher-php-ini
         configMap:
           name: hydra-dispatcher-php-ini
+      - name: xdebug-dispatcher-config
+        configMap:
+          name: xdebug-dispatcher-config