From 417e9d85f0221781bd793b74a64c97b841ad2719 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Fri, 15 Dec 2023 09:41:03 +0100 Subject: [PATCH] feat(hydra): mise en place du stockage des session redis sur la stack hydra, et correction logout sur hydra-oidc --- components/hydra-oidc/kustomization.yaml | 5 +++-- .../{hydra-dispatcher-env.yaml => hydra-oidc-env.yaml} | 0 components/hydra-oidc/resources/hydra-oidc-deployment.yaml | 4 ++-- components/hydra-sql/kustomization.yaml | 2 +- components/hydra-sql/resources/hydra-sql-deployment.yaml | 4 ++-- resources/hydra-dispatcher/kustomization.yaml | 1 + .../resources/hydra-dispatcher-deployment.yaml | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) rename components/hydra-oidc/patches/{hydra-dispatcher-env.yaml => hydra-oidc-env.yaml} (100%) diff --git a/components/hydra-oidc/kustomization.yaml b/components/hydra-oidc/kustomization.yaml index 88288e0..215184b 100644 --- a/components/hydra-oidc/kustomization.yaml +++ b/components/hydra-oidc/kustomization.yaml @@ -26,6 +26,7 @@ configMapGenerator: - CLIENT_SECRET_FC=MyClientSecret - COOKIE_PATH=/ - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR + - REDIS_DSN="redis://redis:6379" # - name: hydra-dispatcher-apps # behavior: merge # files: @@ -35,5 +36,5 @@ patchesJson6902: - target: version: v1 kind: ConfigMap - name: hydra-dispatcher-env - path: patches/hydra-dispatcher-env.yaml + name: hydra-oidc-env + path: patches/hydra-oidc-env.yaml diff --git a/components/hydra-oidc/patches/hydra-dispatcher-env.yaml b/components/hydra-oidc/patches/hydra-oidc-env.yaml similarity index 100% rename from components/hydra-oidc/patches/hydra-dispatcher-env.yaml rename to components/hydra-oidc/patches/hydra-oidc-env.yaml diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml index dd62f7e..4a5471c 100644 --- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml +++ b/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:2023.11.17-develop.1657.761e035 + image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.927.f9e0630 imagePullPolicy: Always args: ["/usr/sbin/php-fpm81", "-F", "-e"] readinessProbe: @@ -47,7 +47,7 @@ spec: name: hydra-oidc-env resources: {} - - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035 + - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.927.f9e0630 imagePullPolicy: Always name: hydra-oidc-nginx args: ["/usr/sbin/nginx"] diff --git a/components/hydra-sql/kustomization.yaml b/components/hydra-sql/kustomization.yaml index 5aff91e..b138dd7 100644 --- a/components/hydra-sql/kustomization.yaml +++ b/components/hydra-sql/kustomization.yaml @@ -17,7 +17,7 @@ configMapGenerator: - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql" - DB_USER="makeMeASecret" - DB_PASSWORD="makeMeASecret" - - REDIS_DSN="redis://rfs-redis:26379?&redis_sentinel=mymaster" + - REDIS_DSN="redis://redis:6379" - PEPPER="MakeMeABigSecret" - name: sql-login-config files: diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index 45c95ec..0b03667 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: hydra-sql-fpm - image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.12-develop.848.72e912f + image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756 imagePullPolicy: Always args: ["/usr/sbin/php-fpm81", "-F", "-e"] readinessProbe: @@ -54,7 +54,7 @@ spec: subPath: "sql_login.yaml" - name: hydra-sql-nginx - image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.12-develop.848.72e912f + image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756 imagePullPolicy: Always args: ["/usr/sbin/nginx"] readinessProbe: diff --git a/resources/hydra-dispatcher/kustomization.yaml b/resources/hydra-dispatcher/kustomization.yaml index 8bba48f..0eb6055 100644 --- a/resources/hydra-dispatcher/kustomization.yaml +++ b/resources/hydra-dispatcher/kustomization.yaml @@ -21,6 +21,7 @@ configMapGenerator: - COOKIE_PATH=/ - DEFAULT_LOCALE=fr - APP_LOCALES=fr,en + - REDIS_DSN= redis://redis:6379?&prefix=hydradispatcher&ttl=3600 - name: hydra-dispatcher-apps files: - apps.yaml=./files/hydra/default.yaml diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml index 9ce5670..4425640 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: hydra-dispatcher-php-fpm - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.23-develop.1635.0c3bdb6 + image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347 args: ["/usr/sbin/php-fpm81", "-F", "-e"] readinessProbe: exec: @@ -49,7 +49,7 @@ spec: name: hydra-dispatcher-apps resources: {} - - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.23-develop.1635.0c3bdb6 + - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347 imagePullPolicy: Always name: hydra-dispatcher-nginx args: ["/usr/sbin/nginx"]