Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/mastodon/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 9.7.0
version: 9.8.0

# renovate: image=ghcr.io/mastodon/mastodon
appVersion: v4.3.1
Expand Down
10 changes: 8 additions & 2 deletions charts/mastodon/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# mastodon

![Version: 9.7.0](https://img.shields.io/badge/Version-9.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.3.1](https://img.shields.io/badge/AppVersion-v4.3.1-informational?style=flat-square)
![Version: 9.8.0](https://img.shields.io/badge/Version-9.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.3.1](https://img.shields.io/badge/AppVersion-v4.3.1-informational?style=flat-square)

Mastodon is a free, open-source social network server based on ActivityPub.

Expand Down Expand Up @@ -57,7 +57,7 @@ Mastodon is a free, open-source social network server based on ActivityPub.
| mastodon.cron.updateSearchIndexMappings.schedule | string | `"0 * * * *"` | run once an hour |
| mastodon.deepl.apiKeySecretRef.key | string | `""` | |
| mastodon.deepl.apiKeySecretRef.name | string | `""` | |
| mastodon.deepl.enabled | bool | `false` | |
| mastodon.deepl.enabled | bool | `false` | enable the use of deepl for translations |
| mastodon.deepl.plan | string | `""` | |
| mastodon.extraEnvFrom | string | `""` | Alternatively specify extra environment variables stored in a ConfigMap. The specified ConfigMap should contain the additional environment variables in key-value format. |
| mastodon.extraEnvVars | list | `[]` | 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.) |
Expand All @@ -73,6 +73,12 @@ Mastodon is a free, open-source social network server based on ActivityPub.
| mastodon.hooks.s3Upload.secretRef.keys.accesKeyId | string | `"acces-key-id"` | |
| mastodon.hooks.s3Upload.secretRef.keys.secretAccessKey | string | `"secret-access-key"` | |
| mastodon.hooks.s3Upload.secretRef.name | string | `nil` | |
| mastodon.libretranslate.apiKey | string | `""` | |
| mastodon.libretranslate.enabled | bool | `false` | enable the use of libretranslate for translations |
| mastodon.libretranslate.endpoint | string | `""` | |
| mastodon.libretranslate.existingSecret | string | `""` | use an existing secret for libretranslate endpoint and api key |
| mastodon.libretranslate.secretKeys.apiKey | string | `""` | |
| mastodon.libretranslate.secretKeys.endpoint | string | `""` | |
| mastodon.limitedFederationMode | bool | `false` | Enables "Limited Federation Mode" for more detauls see: https://docs.joinmastodon.org/admin/config/#limited_federation_mode |
| mastodon.local_domain | string | `"mastodon.local"` | |
| mastodon.locale | string | `"en"` | available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71 |
Expand Down
24 changes: 23 additions & 1 deletion charts/mastodon/templates/deployment-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,35 @@ spec:
name: {{ .Values.mastodon.s3.existingSecret }}
key: {{ .Values.mastodon.s3.secretKeys.s3AccessKey }}
{{- end }}
{{- if and .Values.mastodon.deepl.enabled }}
{{- if .Values.mastodon.deepl.enabled }}
- name: "DEEPL_API_KEY"
valueFrom:
secretKeyRef:
name: {{ .Values.mastodon.deepl.apiKeySecretRef.name }}
key: {{ .Values.mastodon.deepl.apiKeySecretRef.key }}
{{- end }}
{{- if .Values.mastodon.libretranslate.enabled }}
- name: "LIBRE_TRANSLATE_API_KEY"
valueFrom:
secretKeyRef:
{{- if .Values.mastodon.libretranslate.existingSecret }}
name: {{ .Values.mastodon.libretranslate.existingSecret }}
key: {{ .Values.mastodon.libretranslate.secretKeys.apiKey }}
{{- else -}}
name: {{ include "mastodon.fullname" . }}-libretranslate
key: apiKey
{{- end }}
- name: "LIBRE_TRANSLATE_ENDPOINT"
valueFrom:
secretKeyRef:
{{- if .Values.mastodon.libretranslate.existingSecret }}
name: {{ .Values.mastodon.libretranslate.existingSecret }}
key: {{ .Values.mastodon.libretranslate.secretKeys.endpoint }}
{{- else -}}
name: {{ include "mastodon.fullname" . }}-libretranslate
key: endpoint
{{- end }}
{{- end }}
{{- if or .Values.mastodon.web.otel.enabled (and .Values.mastodon.otel.enabled (ne .Values.mastodon.web.otel.enabled false)) }}
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }}
Expand Down
12 changes: 12 additions & 0 deletions charts/mastodon/templates/secret-libretranslate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{{- if and .Values.mastodon.libretranslate.enabled (not .Values.mastodon.libretranslate.existingSecret) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "mastodon.fullname" . }}-libretranslate
labels:
{{- include "mastodon.labels" . | nindent 4 }}
type: Opaque
data:
apiKey: {{ .Values.mastodon.libretranslate.apiKey | b64enc }}
endpoint: {{ .Values.mastodon.libretranslate.endpoint | b64enc }}
{{- end }}
12 changes: 12 additions & 0 deletions charts/mastodon/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,24 @@ mastodon:
s3Region: ""

deepl:
# -- enable the use of deepl for translations
enabled: false
plan: ""
apiKeySecretRef:
name: ""
key: ""

libretranslate:
# -- enable the use of libretranslate for translations
enabled: false
endpoint: ""
apiKey: ""
# -- use an existing secret for libretranslate endpoint and api key
existingSecret: ""
secretKeys:
endpoint: ""
apiKey: ""

secrets:
# -- must be set manually; autogenerated keys are rotated on each upgrade
secret_key_base: ""
Expand Down