CadolesKube/sso-kustom
14
0
Fork 0
Code Issues 17 Pull Requests 4 Projects Releases Wiki Activity

feat(hydra): mise en place du stockage des session redis sur la stack hydra, et correction logout sur hydra-oidc #31

Merged
wpetit merged 7 commits from hydra-redis into develop 2023-12-18 11:18:33 +01:00
Conversation 0 Commits 7 Files Changed 17 +88 -15
17 changed files with 88 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/hydra-oidc/kustomization.yaml
View File

@ -5,6 +5,10 @@ resources:
- ./resources/hydra-oidc-deployment.yaml
- ./resources/hydra-oidc-service.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator:
- name: hydra-oidc-env
literals:
@ -26,6 +30,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 +40,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

0
components/hydra-oidc/patches/hydra-dispatcher-env.yaml → components/hydra-oidc/patches/hydra-oidc-env.yaml
View File

4
components/hydra-oidc/resources/hydra-oidc-deployment.yaml
View File

@ -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.1012.d57f2ad
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.1012.d57f2ad
imagePullPolicy: Always
name: hydra-oidc-nginx
args: ["/usr/sbin/nginx"]

3
components/hydra-saml/resources/hydra-saml-remote-user.yaml
View File

@ -23,7 +23,7 @@ spec:
- configMapRef:
name: hydra-saml-env
ports:
- containerPort: 80
- containerPort: 8080
resources: {}
restartPolicy: Always
---
@ -37,6 +37,7 @@ spec:
ports:
- name: http
port: 80
targetPort: 8080
selector:
io.kompose.service: hydra-saml-remote-user
status:

6
components/hydra-sql/kustomization.yaml
View File

@ -5,6 +5,10 @@ resources:
- ./resources/hydra-sql-service.yaml
- ./resources/hydra-sql-deployment.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator:
- name: hydra-sql-env
literals:
@ -17,7 +21,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:

4
components/hydra-sql/resources/hydra-sql-deployment.yaml
View File

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

22
components/redis/README.md Normal file
View File

@ -0,0 +1,22 @@
# Composant `redis`
### Description
Les applications `hydra-dispatcher`, `hydra-sql` et `hydra-oidc` stockent dorénavant le cache et les sessions utilisateur sur un serveur Redis.
Le DSN du serveur est défini dans leur variable d'environnement respective `REDIS_DSN`.
Les applications peuvent utiliser le mode `sentinel` de redis
wpetit marked this conversation as resolved Outdated
wpetit commented 2023-12-18 10:43:38 +01:00
Outdated
Review
Copy Link

Petite typo ici

Petite typo ici
Il est donc nécessaire donc nécessaire de disposer d'un serveur Redis pour utiliser ces applications.
### Principe général de fonctionnement
Un `RedisFailOver` crée un cluster redis en mode sentinel avec 3 réplicats chacun.
wpetit marked this conversation as resolved Outdated
wpetit commented 2023-12-18 10:44:04 +01:00
Outdated
Review
Copy Link

Typo: patche

Typo: patch~~e~~
### Personnalisation
Via des `patches` sur la ressource `ConfigMap` via un label selector `com.cadoles.forge.sso-kustom/session=redis` il est possible de modifier la valeur du `REDIS_DSN`.
|Clé|Description|Exemple|
|---|-----------|-------|
|`REDIS_DSN`| DSN du cluster Redis | `redis://rfs-sso-redis:26379?&redis_sentinel=mymaster`

11
components/redis/kustomization.yaml Normal file
View File

@ -0,0 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- ./resources/redis-failover.yaml
patches:
- path: ./patches/hydra-apps.yaml
target:
kind: ConfigMap
labelSelector: "com.cadoles.forge.sso-kustom/session=redis"

3
components/redis/patches/hydra-apps.yaml Normal file
View File

@ -0,0 +1,3 @@
- op: replace
path: "/data/REDIS_DSN"
value: "redis://rfs-sso-redis:26379?&redis_sentinel=mymaster"

21
components/redis/resources/redis-failover.yaml Normal file
View File

@ -0,0 +1,21 @@
apiVersion: databases.spotahome.com/v1
kind: RedisFailover
metadata:
name: sso-redis
spec:
sentinel:
replicas: 3
resources:
requests:
cpu: 100m
limits:
memory: 100Mi
redis:
replicas: 3
resources:
requests:
cpu: 100m
memory: 100Mi
limits:
cpu: 400m
memory: 500Mi

1
doc/README.md
View File

@ -1 +0,0 @@
# Documentation

2
examples/authenticated-app/README.md
View File

@ -15,7 +15,7 @@ L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
2. Déployer les opérateurs nécessaires au déploiement
```
kubectl kustomize --enable-helm ./examples/k8s/kind/cluster | kubectl apply -f -
kubectl apply -k ./examples/k8s/kind/cluster --server-side
```
3. Déployer l'application

3
examples/k8s/kind/cluster/kustomization.yaml
View File

@ -3,6 +3,7 @@ kind: Kustomization
resources:
- https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
- https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
- https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
patchesJson6902:
@ -11,4 +12,4 @@ patchesJson6902:
kind: ConfigMap
name: ingress-nginx-controller
namespace: ingress-nginx
path: patches/nginx-controller.yaml
path: patches/nginx-controller.yaml

3
overlays/full/kustomization.yaml
View File

@ -14,4 +14,5 @@ components:
- ../../components/hydra-oidc
- ../../components/hydra-saml
- ../../components/hydra-sql
- ../../components/oidc-test
- ../../components/oidc-test
- ../../components/redis

2
resources/hydra-dispatcher/files/hydra/default.yaml
View File

@ -14,4 +14,4 @@ hydra:
api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
firewall:
additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
rules: {}
rules: {}

5
resources/hydra-dispatcher/kustomization.yaml
View File

@ -5,6 +5,10 @@ resources:
- ./resources/hydra-dispatcher-deployment.yaml
- ./resources/hydra-dispatcher-service.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator:
- name: hydra-dispatcher-env
literals:
@ -21,6 +25,7 @@ configMapGenerator:
- COOKIE_PATH=/
- DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en
- REDIS_DSN="redis://redis:6379"
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml

4
resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
View File

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