Enable supplementary environment variables.

templates/deployment-sidekiq.yaml

@@ -84,6 +84,10 @@ spec:
                 name: {{ include "mastodon.fullname" $context }}-env
             - secretRef:
                 name: {{ template "mastodon.secretName" $context }}
+            {{- if $context.Values.mastodon.extraEnvironment }}
+            - configMapRef:
+                name: {{ $context.Values.mastodon.extraEnvironment }}
+            {{- end}}
           env:
             - name: "DB_PASS"
               valueFrom:

templates/deployment-streaming.yaml

@@ -49,6 +49,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
+            {{- if .Values.mastodon.extraEnvironment }}
+            - configMapRef:
+                name: {{ .Values.mastodon.extraEnvironment }}
+            {{- end}}
           env:
             - name: "DB_PASS"
               valueFrom:

templates/deployment-web.yaml

@@ -65,6 +65,10 @@ spec:
                 name: {{ include "mastodon.fullname" . }}-env
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
+            {{- if .Values.mastodon.extraEnvironment }}
+            - configMapRef:
+                name: {{ .Values.mastodon.extraEnvironment }}
+            {{- end}}
           env:
             - name: "DB_PASS"
               valueFrom:

values.yaml

@@ -206,6 +206,11 @@ mastodon:
   # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements
   preparedStatements: true
 
+  # Specify extra environment variables to be added to all Mastodon pods.
+  # These can be used for configuration not included in this chart (including configuration for Mastodon varietals.)
+  # The specified ConfigMap should contain the additional environment variables in key-value format.
+  # extraEnvironment: <config-map-name>
+
 ingress:
   enabled: true
   annotations: