From 477e1d3f711bb4fe19199a1fbf9ac77d0c219fbe Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 18 Sep 2023 03:19:21 +0200
Subject: [PATCH] fix(mastodon): Use basic redis protocol without redis
This patch removes some of the work that introduces sentinel as part of
the redis deployment. Sadly Mastodon isn't really sentinel compatible,
which makes it quite redundant. Instead we introduce a new service for
the redis-cluster, because the operator has this feature only in
unstable versions for now. This service will always point to the current
master node.
---
apps/base/mastodon/redis.yaml | 19 +++++++++++++++++++
apps/base/mastodon/release.yaml | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/apps/base/mastodon/redis.yaml b/apps/base/mastodon/redis.yaml
index 8d62949f0..2a5f07066 100644
--- a/apps/base/mastodon/redis.yaml
+++ b/apps/base/mastodon/redis.yaml
@@ -1,6 +1,8 @@
apiVersion: databases.spotahome.com/v1
kind: RedisFailover
metadata:
+ labels:
+ app.kubernetes.io/name: mastodon
name: mastodon-redis
namespace: mastodon
spec:
@@ -22,3 +24,20 @@ spec:
limits:
memory: 256Mi
cpu: 200m
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app.kubernetes.io/name: mastodon
+ name: mastodon-redis-master
+ namespace: mastodon
+spec:
+ ports:
+ - name: redis
+ port: 6379
+ protocol: TCP
+ targetPort: 6379
+ selector:
+ app.kubernetes.io/name: mastodon-redis
+ redisfailovers-role: master
\ No newline at end of file
diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
index a1f0b8b8a..4ca29da7f 100644
--- a/apps/base/mastodon/release.yaml
+++ b/apps/base/mastodon/release.yaml
@@ -161,6 +161,6 @@ data:
enabled: false
redis:
enabled: false
- redisUrl: redis://rfs-mastodon-redis:26379/mymaster
+ redisUrl: redis://mastodon-redis-master:6379
auth:
enabled: false
--
GitLab