From aa1214bcfcdf0dccbb228c80e26fe62c047a3db1 Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Mon, 8 Jul 2024 15:44:57 +0200
Subject: [PATCH] Additional rollout strategy for the rest of the deployments

---
 templates/deployment-sidekiq.yaml   |  5 ++++-
 templates/deployment-streaming.yaml | 12 ++++++++++++
 templates/deployment-web.yaml       |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index 1870cf4..ef8cfa7 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -19,7 +19,10 @@ spec:
       {{ fail "The scheduler queue should never have more than 1 replicas" }}
     {{- end }}
   strategy:
-    type: Recreate
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 10%
+      maxUnavailable: 25%
   {{- end }}
   replicas: {{ .replicas }}
   {{- if (ne (toString $context.Values.mastodon.revisionHistoryLimit) "<nil>") }}
diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml
index 0d7d071..c3708a7 100644
--- a/templates/deployment-streaming.yaml
+++ b/templates/deployment-streaming.yaml
@@ -13,6 +13,11 @@ spec:
   {{- if (ne (toString .Values.mastodon.revisionHistoryLimit) "<nil>") }}
   revisionHistoryLimit: {{ .Values.mastodon.revisionHistoryLimit }}
   {{- end }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 10%
+      maxUnavailable: 25%
   selector:
     matchLabels:
       {{- include "mastodon.selectorLabels" . | nindent 6 }}
@@ -135,6 +140,13 @@ spec:
             httpGet:
               path: /api/v1/streaming/health
               port: streaming
+          startupProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 15
+            failureThreshold: 30
+            periodSeconds: 5
           {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
           resources:
             {{- toYaml . | nindent 12 }}
diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
index 640ab0d..70d1c29 100644
--- a/templates/deployment-web.yaml
+++ b/templates/deployment-web.yaml
@@ -16,7 +16,7 @@ spec:
   strategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 2
+      maxSurge: 10%
       maxUnavailable: 25%
   selector:
     matchLabels: