From c7aef504284972e0ec6880407bd60c0ebde03f9d Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Tue, 29 Jul 2025 20:14:41 -0500
Subject: [PATCH] switch redis

---
 .../cl01tl/platform/matrix-synapse/Chart.yaml | 10 ----
 .../templates/external-secret.yaml            |  6 +--
 .../platform/matrix-synapse/values.yaml       | 51 +------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
index 8a78336ff..23940a0bd 100644
--- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
@@ -16,7 +16,6 @@ sources:
   - https://github.com/matrix-org/matrix-hookshot
   - https://github.com/mautrix/discord
   - https://github.com/mautrix/whatsapp
-  - https://github.com/valkey-io/valkey
   - https://github.com/cloudflare/cloudflared
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://hub.docker.com/r/halfshot/matrix-hookshot
@@ -24,7 +23,6 @@ sources:
   - https://mau.dev/mautrix/whatsapp/container_registry
   - https://gitlab.com/ananace/charts/-/tree/master/charts/matrix-synapse
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/cloudflared
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
@@ -45,14 +43,6 @@ dependencies:
   #   alias: mautrix-whatsapp
   #   repository: https://bjw-s-labs.github.io/helm-charts/
   #   version: 4.0.1
-  - name: valkey
-    alias: valkey-synapse
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
-  - name: valkey
-    alias: valkey-hookshot
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: cloudflared
     alias: cloudflared-synapse
     version: 1.18.0
diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
index 5a0647e55..5764fb233 100644
--- a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
@@ -179,10 +179,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: matrix-synapse-valkey-secret
+  name: matrix-synapse-redis-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-valkey-secret
+    app.kubernetes.io/name: matrix-synapse-redis-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -194,7 +194,7 @@ spec:
       remoteRef:
         conversionStrategy: Default
         decodingStrategy: None
-        key: /cl01tl/matrix-synapse/valkey
+        key: /cl01tl/matrix-synapse/redis
         metadataPolicy: None
         property: password
 
diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml
index 56eaae3d1..036088aad 100644
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -102,9 +102,9 @@ matrix-synapse:
   redis:
     enabled: false
   externalRedis:
-    host: matrix-synapse-valkey-primary
+    host: redis-replication-matrix-synapse-master
     port: 6379
-    existingSecret: matrix-synapse-valkey-secret
+    existingSecret: matrix-synapse-redis-secret
     existingSecretPasswordKey: password
   persistence:
     enabled: true
@@ -288,53 +288,6 @@ mautrix-whatsapp:
               readOnly: true
               mountPropagation: None
               subPath: config.yaml
-valkey-synapse:
-  fullnameOverride: matrix-synapse-valkey
-  architecture: replication
-  auth:
-    enabled: true
-    existingSecret: matrix-synapse-valkey-secret
-    existingSecretPasswordKey: password
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
-  replica:
-    replicaCount: 1
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
-valkey-hookshot:
-  fullnameOverride: matrix-hookshot-valkey
-  architecture: replication
-  auth:
-    enabled: false
-    usePasswordFiles: false
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
-  replica:
-    replicaCount: 1
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
 cloudflared-synapse:
   name: cloudflared-synapse
   existingSecretName: matrix-synapse-cloudflared-synapse-secret