From 7a802a6d28774e88d48963c94167a89c64ce2e44 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Fri, 15 Dec 2023 14:44:04 +0100
Subject: [PATCH] =?UTF-8?q?ajout=20redis=20=C3=A0=20l'example?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/README.md                                 |  9 +++++++-
 examples/authenticated-app/README.md          |  2 +-
 examples/k8s/kind/cluster/kustomization.yaml  |  3 ++-
 overlays/base/kustomization.yaml              |  1 +
 overlays/base/patches/sso-redis.yaml          | 21 +++++++++++++++++++
 .../hydra-dispatcher/files/hydra/default.yaml |  2 +-
 resources/hydra-dispatcher/kustomization.yaml |  2 +-
 7 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 overlays/base/patches/sso-redis.yaml

diff --git a/doc/README.md b/doc/README.md
index 7d8b3af..0dc6be7 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1 +1,8 @@
-# Documentation
\ No newline at end of file
+# Documentation
+
+### Redis
+
+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
+Il est donc nécessaire donc nécessaire de disposer d'un serveur Redis pour utiliser ces applications.
diff --git a/examples/authenticated-app/README.md b/examples/authenticated-app/README.md
index d3fa32b..be79890 100644
--- a/examples/authenticated-app/README.md
+++ b/examples/authenticated-app/README.md
@@ -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
diff --git a/examples/k8s/kind/cluster/kustomization.yaml b/examples/k8s/kind/cluster/kustomization.yaml
index 760eb72..af48eba 100644
--- a/examples/k8s/kind/cluster/kustomization.yaml
+++ b/examples/k8s/kind/cluster/kustomization.yaml
@@ -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
\ No newline at end of file
+    path: patches/nginx-controller.yaml
diff --git a/overlays/base/kustomization.yaml b/overlays/base/kustomization.yaml
index b85a923..ef391a7 100644
--- a/overlays/base/kustomization.yaml
+++ b/overlays/base/kustomization.yaml
@@ -4,6 +4,7 @@ kind: Kustomization
 resources:
 - ../../resources/hydra
 - ../../resources/hydra-dispatcher
+- patches/sso-redis.yaml
 
 labels:
   - pairs:
diff --git a/overlays/base/patches/sso-redis.yaml b/overlays/base/patches/sso-redis.yaml
new file mode 100644
index 0000000..01f1e3a
--- /dev/null
+++ b/overlays/base/patches/sso-redis.yaml
@@ -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
diff --git a/resources/hydra-dispatcher/files/hydra/default.yaml b/resources/hydra-dispatcher/files/hydra/default.yaml
index 52e6dbb..d86c656 100644
--- a/resources/hydra-dispatcher/files/hydra/default.yaml
+++ b/resources/hydra-dispatcher/files/hydra/default.yaml
@@ -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: {}
\ No newline at end of file
+    rules: {}
diff --git a/resources/hydra-dispatcher/kustomization.yaml b/resources/hydra-dispatcher/kustomization.yaml
index 0eb6055..8f2c569 100644
--- a/resources/hydra-dispatcher/kustomization.yaml
+++ b/resources/hydra-dispatcher/kustomization.yaml
@@ -21,7 +21,7 @@ configMapGenerator:
   - COOKIE_PATH=/
   - DEFAULT_LOCALE=fr
   - APP_LOCALES=fr,en
-  - REDIS_DSN= redis://redis:6379?&prefix=hydradispatcher&ttl=3600
+  - REDIS_DSN="redis://rfs-sso-redis:26379?&redis_sentinel=mymaster"
 - name: hydra-dispatcher-apps
   files:
   - apps.yaml=./files/hydra/default.yaml