From 65f218fe0eeedfc11508991f9c060f320f2419b3 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 12 Nov 2022 00:01:22 +0100
Subject: [PATCH] fix(mastodon): Remove no-longer needed hotfixes for mastodon

The new release provides the labels and a bunch of improvements.

This patch also increases the replica count in order to provide some better
scaling.
---
 apps/base/mastodon/release.yaml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
index 89c738c6a..0faed1bc9 100644
--- a/apps/base/mastodon/release.yaml
+++ b/apps/base/mastodon/release.yaml
@@ -67,38 +67,18 @@ spec:
                     secretName: namespace-ca
                     optional: false
         patchesStrategicMerge:
-          - kind: Service
-            apiVersion: v1
-            metadata:
-              name: mastodon-web
-            spec:
-              selector:
-                app.kubernetes.io/component: web
-          - kind: Service
-            apiVersion: v1
-            metadata:
-              name: mastodon-streaming
-            spec:
-              selector:
-                app.kubernetes.io/component: streaming
           - kind: Deployment
             apiVersion: apps/v1
             metadata:
               name: mastodon-streaming
             spec:
-              template:
-                metadata:
-                  labels:
-                    app.kubernetes.io/component: streaming
+              replicas: 2
           - kind: Deployment
             apiVersion: apps/v1
             metadata:
               name: mastodon-web
             spec:
-              template:
-                metadata:
-                  labels:
-                    app.kubernetes.io/component: web
+              replicas: 2
           - kind: ConfigMap
             apiVersion: v1
             metadata:
-- 
GitLab