From 89e8a2768f3226610d91f047b07ca22a83c317c4 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Wed, 25 May 2022 14:28:40 +0000
Subject: [PATCH] Removed HPAs

---
 manifests/mastodon/hpa.yaml      | 144 +++++++++++++++----------------
 manifests/mastodon/mastodon.yaml |   3 +
 2 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/manifests/mastodon/hpa.yaml b/manifests/mastodon/hpa.yaml
index d97a9e5..938f515 100644
--- a/manifests/mastodon/hpa.yaml
+++ b/manifests/mastodon/hpa.yaml
@@ -1,73 +1,73 @@
 
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: mastodon-web
-  namespace: mastodon
-  labels:
-    app.kubernetes.io/name: mastodon
-    app.kubernetes.io/instance: "k8s.social"
-    app.kubernetes.io/component: web
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: mastodon-web
-  minReplicas: 2
-  maxReplicas: 6
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          averageUtilization: 80
-          type: Utilization
----
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: mastodon-sidekiq
-  namespace: mastodon
-  labels:
-    app.kubernetes.io/name: mastodon
-    app.kubernetes.io/instance: "k8s.social"
-    app.kubernetes.io/component: sidekiq
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: mastodon-sidekiq
-  minReplicas: 2
-  maxReplicas: 6
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          averageUtilization: 80
-          type: Utilization
----
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: mastodon-streaming
-  namespace: mastodon
-  labels:
-    app.kubernetes.io/name: mastodon
-    app.kubernetes.io/instance: "k8s.social"
-    app.kubernetes.io/component: streaming
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: mastodon-streaming
-  minReplicas: 2
-  maxReplicas: 6
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          averageUtilization: 80
-          type: Utilization
----
+# apiVersion: autoscaling/v2beta2
+# kind: HorizontalPodAutoscaler
+# metadata:
+#   name: mastodon-web
+#   namespace: mastodon
+#   labels:
+#     app.kubernetes.io/name: mastodon
+#     app.kubernetes.io/instance: "k8s.social"
+#     app.kubernetes.io/component: web
+# spec:
+#   scaleTargetRef:
+#     apiVersion: apps/v1
+#     kind: Deployment
+#     name: mastodon-web
+#   minReplicas: 2
+#   maxReplicas: 6
+#   metrics:
+#     - type: Resource
+#       resource:
+#         name: cpu
+#         target:
+#           averageUtilization: 80
+#           type: Utilization
+# ---
+# apiVersion: autoscaling/v2beta2
+# kind: HorizontalPodAutoscaler
+# metadata:
+#   name: mastodon-sidekiq
+#   namespace: mastodon
+#   labels:
+#     app.kubernetes.io/name: mastodon
+#     app.kubernetes.io/instance: "k8s.social"
+#     app.kubernetes.io/component: sidekiq
+# spec:
+#   scaleTargetRef:
+#     apiVersion: apps/v1
+#     kind: Deployment
+#     name: mastodon-sidekiq
+#   minReplicas: 2
+#   maxReplicas: 6
+#   metrics:
+#     - type: Resource
+#       resource:
+#         name: cpu
+#         target:
+#           averageUtilization: 80
+#           type: Utilization
+# ---
+# apiVersion: autoscaling/v2beta2
+# kind: HorizontalPodAutoscaler
+# metadata:
+#   name: mastodon-streaming
+#   namespace: mastodon
+#   labels:
+#     app.kubernetes.io/name: mastodon
+#     app.kubernetes.io/instance: "k8s.social"
+#     app.kubernetes.io/component: streaming
+# spec:
+#   scaleTargetRef:
+#     apiVersion: apps/v1
+#     kind: Deployment
+#     name: mastodon-streaming
+#   minReplicas: 2
+#   maxReplicas: 6
+#   metrics:
+#     - type: Resource
+#       resource:
+#         name: cpu
+#         target:
+#           averageUtilization: 80
+#           type: Utilization
+# ---
diff --git a/manifests/mastodon/mastodon.yaml b/manifests/mastodon/mastodon.yaml
index d0cc753..e25463e 100644
--- a/manifests/mastodon/mastodon.yaml
+++ b/manifests/mastodon/mastodon.yaml
@@ -68,6 +68,7 @@ metadata:
     configmap.reloader.stakater.com/reload: "mastodon-env"
     secret.reloader.stakater.com/reload: "mastodon"
 spec:
+  replicas: 5
   selector:
     matchLabels:
       app.kubernetes.io/name: mastodon
@@ -138,6 +139,7 @@ metadata:
     configmap.reloader.stakater.com/reload: "mastodon-env"
     secret.reloader.stakater.com/reload: "mastodon"
 spec:
+  replicas: 3
   selector:
     matchLabels:
       app.kubernetes.io/name: mastodon
@@ -220,6 +222,7 @@ metadata:
     configmap.reloader.stakater.com/reload: "mastodon-env"
     secret.reloader.stakater.com/reload: "mastodon"
 spec:
+  replicas: 4
   selector:
     matchLabels:
       app.kubernetes.io/name: mastodon