make probes on streaming and web deployments user configurable with existing values as defaults

Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.0.0
+version: 4.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

templates/deployment-streaming.yaml

@@ -62,14 +62,18 @@ spec:
             - name: streaming
               containerPort: {{ .Values.mastodon.streaming.port }}
               protocol: TCP
+          {{- if .Values.mastodon.streaming.livenessProbe }}
           livenessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
+            {{- toYaml .Values.mastodon.streaming.livenessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.mastodon.streaming.readinessProbe }}
           readinessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
+            {{- toYaml .Values.mastodon.streaming.readinessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.mastodon.streaming.startupProbe }}
+          startupProbe:
+            {{- toYaml .Values.mastodon.streaming.startupProbe | nindent 12 }}
+          {{- end }}
           {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
           resources:
             {{- toYaml . | nindent 12 }}

templates/deployment-web.yaml

@@ -97,19 +97,18 @@ spec:
             - name: http
               containerPort: {{ .Values.mastodon.web.port }}
               protocol: TCP
+          {{- if .Values.mastodon.web.livenessProbe }}
           livenessProbe:
-            tcpSocket:
-              port: http
+            {{- toYaml .Values.mastodon.web.livenessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.mastodon.web.readinessProbe }}
           readinessProbe:
-            httpGet:
-              path: /health
-              port: http
+            {{- toYaml .Values.mastodon.web.readinessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.mastodon.web.startupProbe }}
           startupProbe:
-            httpGet:
-              path: /health
-              port: http
-            failureThreshold: 30
-            periodSeconds: 5
+            {{- toYaml .Values.mastodon.web.startupProbe | nindent 12 }}
+          {{- end }}
           {{- with (default .Values.resources .Values.mastodon.web.resources) }}
           resources:
             {{- toYaml . | nindent 12 }}

values.yaml

@@ -169,6 +169,15 @@ mastodon:
     # requests:
     #   cpu: 250m
     #   memory: 128Mi
+    # -- (Streaming Deployment) liveness and readiness probes
+    livenessProbe:
+      httpGet:
+        path: /api/v1/streaming/health
+        port: streaming
+    readinessProbe:
+      httpGet:
+        path: /api/v1/streaming/health
+        port: streaming
   web:
     port: 3000
     # -- Number of Web Pods running
@@ -187,6 +196,20 @@ mastodon:
     # requests:
     #   cpu: 250m
     #   memory: 768Mi
+    # -- (Web Deployment) liveness and readiness probes
+    livenessProbe:
+      tcpSocket:
+        port: http
+    readinessProbe:
+      httpGet:
+        path: /health
+        port: http
+    startupProbe:
+      httpGet:
+        path: /health
+        port: http
+      failureThreshold: 30
+      periodSeconds: 5
 
   metrics:
     statsd: