Remove sql default config

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/files/sql_login.yaml

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

components/hydra-sql/kustomization.yaml

@@ -24,9 +24,13 @@ configMapGenerator:
   - DB_PASSWORD="makeMeASecret"
   - REDIS_DSN="redis://redis:6379"
   - PEPPER="MakeMeABigSecret"
-- name: sql-login-config
+  - OPCACHE_VALIDATE_TIMESTAMP="0"
-  files:
+  - OPCACHE_REVALIDATE_FREQ="0"
-  - ./files/sql_login.yaml
+  - XDEBUG_MODE=off
 - 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,7 +21,7 @@ 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: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
@@ -55,20 +55,15 @@ 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"
-          subPath: "sql_login.yaml"
         - 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: Always
         args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
         readinessProbe:
@@ -107,16 +102,11 @@ 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: xdebug-sql-config
+        configMap:
+          name: xdebug-sql-config
       restartPolicy: Always

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/files/hydra/default.yaml

@@ -1,17 +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)%"
-  firewall:
-    additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
-    rules: {}

resources/hydra-dispatcher/kustomization.yaml

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

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

@@ -41,19 +41,16 @@ 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
         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: xdebug-dispatcher-config
+          mountPath: /etc/php81/conf.d/50_xdebug.ini
+          subPath: 50_xdebug.ini
         resources: {}
         securityContext:
           runAsNonRoot: true
@@ -62,15 +59,7 @@ spec:
       - name: hydra-dispatcher-caddy
         image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
         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
@@ -109,9 +98,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: xdebug-dispatcher-config
+        configMap:
+          name: xdebug-dispatcher-config