From a9fb5371188ebc498ce1a65e9118855fb1977e41 Mon Sep 17 00:00:00 2001
From: ThomasSamson <thomas@samson-pro.fr>
Date: Thu, 9 Oct 2025 11:45:39 +0200
Subject: [PATCH] Squash commit for redis switch

---
 Dockerfile                          |  1 -
 helm/chart/Chart.lock               | 18 ------------------
 helm/chart/Chart.yaml               |  4 ++--
 helm/chart/templates/configmap.yaml |  2 +-
 helm/chart/values-nonprod.yml       |  9 ++++-----
 helm/chart/values-prod.yml          |  9 ++++-----
 helm/chart/values.yaml              | 24 ++++++++++++------------
 7 files changed, 23 insertions(+), 44 deletions(-)
 delete mode 100644 helm/chart/Chart.lock

diff --git a/Dockerfile b/Dockerfile
index 0d60dd5..7783008 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@
 
 
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
-
 ARG PHP_VERSION=8.2
 ARG CADDY_VERSION=2.10.2
 
diff --git a/helm/chart/Chart.lock b/helm/chart/Chart.lock
deleted file mode 100644
index f626756..0000000
--- a/helm/chart/Chart.lock
+++ /dev/null
@@ -1,18 +0,0 @@
-dependencies:
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami/
-  version: 11.9.13
-- name: external-dns
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 5.4.16
-- name: redis
-  repository: https://charts.bitnami.com/bitnami/
-  version: 17.4.3
-- name: meilisearch
-  repository: https://meilisearch.github.io/meilisearch-kubernetes
-  version: 0.1.46
-- name: maildev
-  repository: https://pando85.github.io/helm-maildev/
-  version: 0.3.1
-digest: sha256:282a6d90f79ac02f80158c66f22939298fa1dfba29ecd4d2885e55597c515500
-generated: "2023-02-01T09:52:52.035346504+01:00"
diff --git a/helm/chart/Chart.yaml b/helm/chart/Chart.yaml
index c26efd0..570186a 100644
--- a/helm/chart/Chart.yaml
+++ b/helm/chart/Chart.yaml
@@ -35,8 +35,8 @@ dependencies:
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: external-dns.enabled
   - name: redis
-    version: ~17.4.0
-    repository: https://charts.bitnami.com/bitnami/
+    version: 0.5.2
+    repository: oci://ghcr.io/cloudpirates-io/helm-charts
     condition: redis.enabled
   - name: meilisearch
     version: ~0.1.46
diff --git a/helm/chart/templates/configmap.yaml b/helm/chart/templates/configmap.yaml
index 67bbe47..8dc2d9f 100644
--- a/helm/chart/templates/configmap.yaml
+++ b/helm/chart/templates/configmap.yaml
@@ -19,7 +19,7 @@ data:
   meilisearch-url: "http://{{ include "meilisearch.fullname" .Subcharts.meilisearch }}:7700"
   {{- end }}
   {{- if .Values.redis.enabled }}
-  redis-url: "redis://{{ printf "%s-master" (include "common.names.fullname" .Subcharts.redis) }}"
+  redis-url: "redis://{{ printf "%s" (include "common.fullname" .Subcharts.redis) }}"
   {{- end }}
   payum-gateway: {{ .Values.payum.gateway | quote }}
   php-storage-bucket: {{ .Values.php.storage.bucket | quote }}
diff --git a/helm/chart/values-nonprod.yml b/helm/chart/values-nonprod.yml
index b38ec60..529a7af 100644
--- a/helm/chart/values-nonprod.yml
+++ b/helm/chart/values-nonprod.yml
@@ -22,11 +22,10 @@ meilisearch:
     size: "1Gi"
 
 redis:
-  master:
-    persistence:
-      enabled: true
-      storageClass: "standard"
-      size: "1Gi"
+  persistence:
+    enabled: true
+    storageClass: "standard"
+    size: "1Gi"
 
 postgresql:
   url: change_me
diff --git a/helm/chart/values-prod.yml b/helm/chart/values-prod.yml
index e810596..1eeb108 100644
--- a/helm/chart/values-prod.yml
+++ b/helm/chart/values-prod.yml
@@ -22,11 +22,10 @@ meilisearch:
     size: "1Gi"
 
 redis:
-  master:
-    persistence:
-      enabled: true
-      storageClass: "standard"
-      size: "1Gi"
+  persistence:
+    enabled: true
+    storageClass: "standard"
+    size: "1Gi"
 
 postgresql:
   url: change_me
diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml
index ea570a5..2d4d521 100644
--- a/helm/chart/values.yaml
+++ b/helm/chart/values.yaml
@@ -114,26 +114,26 @@ external-dns:
   rbac:
     create: true
 
-# https://artifacthub.io/packages/helm/bitnami/redis
 redis:
   enabled: true
   auth:
     enabled: false
-  master:
-    startupProbe:
-      enabled: true
-      initialDelaySeconds: 1
-      periodSeconds: 1
-    livenessProbe:
-      initialDelaySeconds: 0
-    readinessProbe:
-      initialDelaySeconds: 0
-  replica:
-    replicaCount: 0
+  # master:
+  #   startupProbe:
+  #     enabled: true
+  #     initialDelaySeconds: 1
+  #     periodSeconds: 1
+  livenessProbe:
+    initialDelaySeconds: 0
+  readinessProbe:
+    initialDelaySeconds: 0
+  replicaCount: 1
 
 # https://github.com/meilisearch/meilisearch-kubernetes/blob/main/charts/meilisearch/README.md
 meilisearch:
   enabled: true
+  image:
+    tag: v0.30.0
   environment:
     MEILI_ENV: 'production'
   resources: