From 4d2ac14345cd578874566035c64cb6f076e6c708 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 8 Jul 2024 23:34:59 +0200
Subject: [PATCH] feat(mastodon): Switch to keydb
---
apps/base/mastodon/kustomization.yaml | 7 +++--
apps/base/mastodon/redis.yaml | 43 ---------------------------
apps/base/mastodon/release.yaml | 2 +-
3 files changed, 6 insertions(+), 46 deletions(-)
delete mode 100644 apps/base/mastodon/redis.yaml
diff --git a/apps/base/mastodon/kustomization.yaml b/apps/base/mastodon/kustomization.yaml
index dfc9a0133..fcf94b977 100644
--- a/apps/base/mastodon/kustomization.yaml
+++ b/apps/base/mastodon/kustomization.yaml
@@ -13,5 +13,8 @@ resources:
- ../../../shared/networkpolicies/allow-from-database.yaml
- ../../../shared/networkpolicies/allow-from-monitoring.yaml
- ../../../shared/networkpolicies/allow-from-redis.yaml
-patchesStrategicMerge:
- - networkpolicy.yaml
+patches:
+ - path: networkpolicy.yaml
+
+components:
+ - ../../../shared/components/keydb
diff --git a/apps/base/mastodon/redis.yaml b/apps/base/mastodon/redis.yaml
deleted file mode 100644
index 2a5f07066..000000000
--- a/apps/base/mastodon/redis.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: databases.spotahome.com/v1
-kind: RedisFailover
-metadata:
- labels:
- app.kubernetes.io/name: mastodon
- name: mastodon-redis
- namespace: mastodon
-spec:
- sentinel:
- replicas: 3
- resources:
- requests:
- cpu: 100m
- memory: 128Mi
- limits:
- cpu: 200m
- memory: 256Mi
- redis:
- replicas: 3
- resources:
- requests:
- memory: 128Mi
- cpu: 100m
- 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 52693e1af..5d15b6a10 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://mastodon-redis-master:6379
+ redisUrl: redis://keydb:6379
auth:
enabled: false
--
GitLab