Merge pull request #153 from small-hack/update-streaming-values

update streaming to match upstream mastodon chart

Author: jessebot

charts/mastodon/Chart.yaml

@@ -9,7 +9,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: 11.0.3
+version: 11.0.4
 
 # renovate: image=ghcr.io/mastodon/mastodon
 appVersion: v4.4.4

charts/mastodon/README.md

@@ -1,6 +1,6 @@
 # mastodon
 
-![Version: 11.0.3](https://img.shields.io/badge/Version-11.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.4](https://img.shields.io/badge/AppVersion-v4.4.4-informational?style=flat-square)
+![Version: 11.0.4](https://img.shields.io/badge/Version-11.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.4](https://img.shields.io/badge/AppVersion-v4.4.4-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 
@@ -283,4 +283,4 @@ Mastodon is a free, open-source social network server based on ActivityPub.
 | volumes | list | `[]` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/mastodon/templates/deployment-streaming.yaml

@@ -4,8 +4,14 @@ metadata:
   name: {{ include "mastodon.fullname" . }}-streaming
   labels:
     {{- include "mastodon.labels" . | nindent 4 }}
+    {{- with .Values.mastodon.streaming.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    {{- with (default .Values.deploymentAnnotations .Values.mastodon.streaming.deploymentAnnotations) }}
+    {{- with .Values.deploymentAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.mastodon.streaming.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
@@ -23,13 +29,23 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with (default .Values.podAnnotations .Values.mastodon.streaming.podAnnotations) }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.mastodon.streaming.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         # roll the pods to pick up any db migrations or other changes
         {{- include "mastodon.rollingPodAnnotations" . | nindent 8 }}
       labels:
+        {{- include "mastodon.globalLabels" . | nindent 8 }}
         {{- include "mastodon.selectorLabels" . | nindent 8 }}
+        {{- with .Values.mastodon.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.mastodon.streaming.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         app.kubernetes.io/component: streaming
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -41,10 +57,19 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.mastodon.extraVolumes }}
+      {{- if or .Values.mastodon.extraVolumes .Values.mastodon.streaming.extraCerts }}
       volumes:
-        {{- if gt (len .Values.mastodon.extraVolumes) 0 }}
-        {{ toYaml .Values.mastodon.extraVolumes | nindent 8}}
+        {{- with .Values.mastodon.extraVolumes }}
+        {{ toYaml . | nindent 8}}
+        {{- end }}
+        {{- with .Values.mastodon.streaming.extraCerts }}
+        {{- $name := .name | default "extra-certs" }}
+        - name: {{ $name }}
+          secret:
+            secretName: {{ .existingSecret }}
+            items:
+            - key: ca.crt
+              path: trusted-ca.crt
         {{- end }}
       {{- end }}
       containers:
@@ -66,6 +91,10 @@ spec:
                 name: {{ .Values.mastodon.extraEnvFrom }}
             {{- end}}
           env:
+            {{- with .Values.mastodon.streaming.extraCerts }}
+            - name: "NODE_EXTRA_CA_CERTS"
+              value: "/usr/local/share/ca-certificates/trusted-ca.crt"
+            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:
@@ -95,11 +124,14 @@ spec:
             {{- with .Values.mastodon.extraEnvVars }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
-          {{- if or .Values.mastodon.extraVolumeMounts }}
           volumeMounts:
-          {{- if gt (len .Values.mastodon.extraVolumeMounts) 0 }}
-          {{- toYaml .Values.mastodon.extraVolumeMounts | nindent 12 }}
+          {{- with .Values.mastodon.extraVolumeMounts }}
+          {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.mastodon.streaming.extraCerts }}
+          {{- $name := .name | default "extra-certs" }}
+          - name: {{ $name }}
+            mountPath: "/usr/local/share/ca-certificates"
           {{- end }}
           ports:
             - name: streaming
@@ -132,6 +164,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with (default .Values.topologySpreadConstraints .Values.mastodon.streaming.topologySpreadConstraints) }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}