Merge pull request 'hydra-sql: Update ref for lower mail fix' (#65 ) from fix-hydra-sql-lower into unstable

Reviewed-on: #65 Reviewed-by: pcaseiro <pcaseiro@cadoles.com>
fix(hydra-sql): Update ref for lower mail fix
2025-03-07 14:48:31 +01:00 · 2025-03-07 14:26:20 +01:00 · 2025-03-07 13:52:29 +01:00 · 2025-03-07 12:29:46 +01:00 · 2025-03-07 11:50:26 +01:00 · 2025-03-07 11:15:43 +01:00
7 changed files with 49 additions and 4 deletions
--- a/components/hydra-cleaner/files/hydra-cleaner.sh
+++ b/components/hydra-cleaner/files/hydra-cleaner.sh
@ -17,7 +17,7 @@ set -o nounset
 # -> delete "cascade" on table "flow" cleans access, code, oidc, pkce and refresh tables.


-DSN="postgresql://${HYDRA_DATABASE_USER}:${HYDRA_DATABASE_PASSWORD}@${HYDRA_DATABASE_SERVICE_NAME}:5432/hydra?sslmode=disable"
+DSN="${DSN:-postgresql://${HYDRA_DATABASE_USER}:${HYDRA_DATABASE_PASSWORD}@${HYDRA_DATABASE_SERVICE_NAME}:${HYDRA_DATABASE_SERVICE_PORT:-5432}/hydra?sslmode=disable}"
 RETENTION_HOURS="${RETENTION_HOURS:-48}"
 BATCH_SIZE="${BATCH_SIZE:-50}"
 LIMIT="${LIMIT:-1000}"
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/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:2025.3.7-develop.1415.7239d84
        imagePullPolicy: IfNotPresent
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
@ -68,7 +68,7 @@ spec:
          subPath: 03_base.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:2025.3.7-develop.1415.7239d84
        imagePullPolicy: IfNotPresent
        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
        readinessProbe:
--- a/examples/authenticated-app/kustomization.yaml
+++ b/examples/authenticated-app/kustomization.yaml
@ -14,6 +14,7 @@ components:
  - ../../components/hydra-ldap
  - ../../components/oidc-test
  - ../../components/redis
+  - ../../components/hydra-cleaner

 patchesJson6902:
  - target:
@ -51,6 +52,16 @@ patchesJson6902:
      kind: OAuth2Client
      name: oidc-test-oauth2-client
    path: patches/oidc-test-oauth2-client.yaml
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-cleaner-env
+    path: patches/hydra-cleaner-env.yaml
+  - target:
+      version: v1
+      kind: CronJob
+      name: hydra-cleaner
+    path: patches/hydra-cleaner.yaml

 configMapGenerator:
  - name: hydra-dispatcher-apps
--- a/examples/authenticated-app/patches/hydra-cleaner-env.yaml
+++ b/examples/authenticated-app/patches/hydra-cleaner-env.yaml
@ -0,0 +1,9 @@
+- op: replace
+  path: "/data/RETENTION_HOURS"
+  value: "1" # 1 HOUR
+- op: replace
+  path: "/data/BATCH_SIZE"
+  value: "100"
+- op: replace
+  path: "/data/LIMIT"
+  value: "1000"
--- a/examples/authenticated-app/patches/hydra-cleaner.yaml
+++ b/examples/authenticated-app/patches/hydra-cleaner.yaml
@ -0,0 +1,3 @@
+- op: replace
+  path: "/spec/schedule"
+  value: "* * * * *"
--- a/resources/hydra/kustomization.yaml
+++ b/resources/hydra/kustomization.yaml
@ -31,6 +31,7 @@ configMapGenerator:
      - URLS_LOGOUT=http://hydra-logout-app/logout
      - HYDRA_SERVE_ALL_ARGS=--dev
      - HYDRA_DATABASE_MAX_CONN="10"
+      - SERVE_ADMIN_REQUEST_LOG_DISABLE_FOR_HEALTH="true"
      - LOG_LEVEL=info

 replacements:
--- a/resources/hydra/resources/hydra-deployment.yaml
+++ b/resources/hydra/resources/hydra-deployment.yaml
@ -46,10 +46,31 @@ spec:
                - wget
                - --spider
                - -q
-                - http://127.0.0.1:4444/.well-known/openid-configuration
+                - http://127.0.0.1:4445/health/alive
            failureThreshold: 6
            periodSeconds: 10
            timeoutSeconds: 10
+          readinessProbe:
+            exec:
+              command:
+                - wget
+                - --spider
+                - -q
+                - http://127.0.0.1:4445/health/ready
+            failureThreshold: 6
+            periodSeconds: 10
+            timeoutSeconds: 10
+          startupProbe:
+            exec:
+              command:
+                - wget
+                - --spider
+                - -q
+                - http://127.0.0.1:4445/health/ready
+            failureThreshold: 60
+            successThreshold: 1
+            periodSeconds: 1
+            timeoutSeconds: 1
          ports:
            - containerPort: 4444
              name: hydra-public
Author	SHA1	Message	Date
pcaseiro	172d9def39	Merge pull request 'hydra-sql: Update ref for lower mail fix' (#65 ) from fix-hydra-sql-lower into unstable Reviewed-on: #65 Reviewed-by: pcaseiro <pcaseiro@cadoles.com>	2025-03-07 14:48:31 +01:00
Gauthier DUPONT	e4b67e0812	fix(hydra-sql): Update ref for lower mail fix	2025-03-07 14:26:20 +01:00
pcaseiro	a26b8aafe1	Merge pull request 'fix(hydra): use same liveness URL as ory's helm' (#63 ) from fix/hydra_liveness_probe_url into unstable Reviewed-on: #63 Reviewed-by: wpetit <wpetit@cadoles.com> Reviewed-by: pcaseiro <pcaseiro@cadoles.com>	2025-03-07 13:52:29 +01:00
Laurent Gourvénec	06235bccad	feat(hydra): disable logs about health requests by default	2025-03-07 12:29:46 +01:00
Laurent Gourvénec	19039c5e1c	feat(hydra): adding readiness and startup probes	2025-03-07 11:50:26 +01:00
Laurent Gourvénec	9e02d7badb	fix(hydra): use same liveness URL as ory's helm	2025-03-07 11:15:43 +01:00
wpetit	87a056be2c	Merge pull request 'feat(hydra-cleaner): add component' (#61 ) from f/hydra_cleaner into unstable Reviewed-on: #61 Reviewed-by: wpetit <wpetit@cadoles.com>	2025-03-06 11:55:17 +01:00
William Petit	fedf44a062	feat(hydra-cleaner): configurable dsn and hydra port	2025-03-06 10:12:18 +01:00
William Petit	b0506995e5	feat: integrate hydra-cleaner in example app	2025-03-06 10:12:18 +01:00