From 0252b1186e17dc2e8dc13c2f46d560e85e99f692 Mon Sep 17 00:00:00 2001
From: Adrien Beaudouin <adrien.beaudouin@outlook.com>
Date: Sat, 9 Sep 2023 16:35:58 +0200
Subject: [PATCH] use redis cluster instead

---
 .../13-a-beautiful-gitops-day-3/index.md      | 80 ++++---------------
 .../16-a-beautiful-gitops-day-6/index.md      |  2 +-
 2 files changed, 15 insertions(+), 67 deletions(-)

diff --git a/content/posts/13-a-beautiful-gitops-day-3/index.md b/content/posts/13-a-beautiful-gitops-day-3/index.md
index f8a0034..fc004c6 100644
--- a/content/posts/13-a-beautiful-gitops-day-3/index.md
+++ b/content/posts/13-a-beautiful-gitops-day-3/index.md
@@ -594,7 +594,7 @@ And that's it, we have replicated PostgreSQL cluster ready to use ! Go to longho
 
 ## Redis cluster
 
-After PostgreSQL, set up a master/slave redis is a piece of cake. You may prefer [redis cluster](https://redis.io/docs/management/scaling/) by using [Bitnami redis cluster](https://artifacthub.io/packages/helm/bitnami/redis-cluster), but it [doesn't work](https://github.com/bitnami/charts/issues/12901) at the time of writing this guide.
+After PostgreSQL, set up a redis cluster is a piece of cake. Let's use [redis cluster](https://redis.io/docs/management/scaling/) by using [Bitnami redis cluster](https://artifacthub.io/packages/helm/bitnami/redis-cluster).
 
 ### Redis variables
 
@@ -639,25 +639,20 @@ resource "kubernetes_secret_v1" "redis_auth" {
 }
 
 resource "helm_release" "redis" {
-  chart      = "redis"
-  version    = "17.15.6"
+  chart      = "redis-cluster"
+  version    = "9.0.3"
   repository = "https://charts.bitnami.com/bitnami"
 
-  name      = "redis"
+  name      = "redis-cluster"
   namespace = kubernetes_namespace_v1.redis.metadata[0].name
 
   set {
-    name  = "architecture"
-    value = "standalone"
-  }
-
-  set {
-    name  = "auth.existingSecret"
+    name  = "existingSecret"
     value = kubernetes_secret_v1.redis_auth.metadata[0].name
   }
 
   set {
-    name  = "auth.existingSecretPasswordKey"
+    name  = "existingSecretPasswordKey"
     value = "redis-password"
   }
 
@@ -672,67 +667,20 @@ resource "helm_release" "redis" {
   }
 
   set {
-    name  = "master.tolerations[0].key"
-    value = "node-role.kubernetes.io/storage"
-  }
-
-  set {
-    name  = "master.tolerations[0].effect"
-    value = "NoSchedule"
-  }
-
-  set {
-    name  = "master.nodeSelector.node-role\\.kubernetes\\.io/primary"
-    type  = "string"
-    value = "true"
-  }
-
-  set {
-    name  = "master.persistence.size"
-    value = "10Gi"
-  }
-
-  set {
-    name  = "master.persistence.storageClass"
-    value = "longhorn-fast"
-  }
-
-  set {
-    name  = "replica.replicaCount"
-    value = "1"
-  }
-
-  set {
-    name  = "replica.tolerations[0].key"
-    value = "node-role.kubernetes.io/storage"
-  }
-
-  set {
-    name  = "replica.tolerations[0].effect"
-    value = "NoSchedule"
-  }
-
-  set {
-    name  = "replica.nodeSelector.node-role\\.kubernetes\\.io/read"
-    type  = "string"
-    value = "true"
-  }
-
-  set {
-    name  = "replica.persistence.size"
-    value = "10Gi"
-  }
-
-  set {
-    name  = "replica.persistence.storageClass"
-    value = "longhorn-fast"
+    name  = "cluster.nodes"
+    value = "3"
   }
 }
 ```
 
 {{< /highlight >}}
 
-And that's it, job done ! Always check that Redis pods are correctly running on storage nodes with `kgpo -n redis -o wide` and volumes are ready on Longhorn.
+And that's it, job done ! Always check that all 3 Redis master pods are correctly running on worker nodes with `kgpo -n redis -o wide` and volumes are ready on Longhorn.
+
+{{< alert >}}
+You need at least 3 nodes for redis cluster working, you should be ok with 3 worker nodes.  
+If not enough workers, use `tolerations` and `nodeSelector` in case of needing to schedule on storage nodes too.
+{{< /alert >}}
 
 ## Backups
 
diff --git a/content/posts/16-a-beautiful-gitops-day-6/index.md b/content/posts/16-a-beautiful-gitops-day-6/index.md
index 0e7e900..7cc6ba1 100644
--- a/content/posts/16-a-beautiful-gitops-day-6/index.md
+++ b/content/posts/16-a-beautiful-gitops-day-6/index.md
@@ -62,7 +62,7 @@ Then the Helm chart itself:
 
 ```tf
 locals {
-  redis_connection = "redis://:${urlencode(var.redis_password)}@redis-master.redis:6379/0"
+  redis_connection = "redis+cluster://:${urlencode(var.redis_password)}@redis-cluster.redis:6379/0"
 }
 
 resource "kubernetes_namespace_v1" "gitea" {