From 02548ade98a8e8a09a71411050b637d5876005ac Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <mail@justjanne.de>
Date: Wed, 26 Mar 2025 15:47:48 +0100
Subject: [PATCH] feat: update mastodon
---
amp/templates/service.yaml | 2 +-
mastodon/Chart.yaml | 4 ++--
mastodon/templates/secret.yaml | 12 ++++++++++--
mastodon/values.yaml | 6 +++++-
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/amp/templates/service.yaml b/amp/templates/service.yaml
index 0009108..5e075f9 100644
--- a/amp/templates/service.yaml
+++ b/amp/templates/service.yaml
@@ -17,7 +17,7 @@ spec:
targetPort: http
{{- range .Values.gamePorts }}
- name: {{ .name }}
- port: {{ .port}}
+ port: {{ .port }}
targetPort: {{ .name }}
protocol: {{ .protocol }}
{{- end }}
diff --git a/mastodon/Chart.yaml b/mastodon/Chart.yaml
index bf7a867..e88423a 100644
--- a/mastodon/Chart.yaml
+++ b/mastodon/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
name: mastodon
description: Helm Chart for mastodon
type: application
-version: 0.5.0
-appVersion: "v4.2"
+version: 0.6.2
+appVersion: "v4.3"
diff --git a/mastodon/templates/secret.yaml b/mastodon/templates/secret.yaml
index e9f6076..b68c143 100644
--- a/mastodon/templates/secret.yaml
+++ b/mastodon/templates/secret.yaml
@@ -18,8 +18,8 @@ stringData:
# See: https://github.com/mastodon/mastodon/issues/16895
# Mode
- RAILS_ENV: production
- NODE_ENV: production
+ RAILS_ENV: "production"
+ NODE_ENV: "production"
# Federation and access
# ----------
@@ -65,6 +65,14 @@ stringData:
VAPID_PRIVATE_KEY: "{{ .Values.keys.vapidPrivate }}"
VAPID_PUBLIC_KEY: "{{ .Values.keys.vapidPublic }}"
+ # Active Record Encryption
+ # --------
+ # Generate with `bin/rails db:encryption:init`
+ # --------
+ ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: "{{ .Values.keys.encryptionDeterministicKey }}"
+ ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: "{{ .Values.keys.encryptionDerivationSalt }}"
+ ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: "{{ .Values.keys.encryptionPrimaryKey }}"
+
# Sending mail
# ------------
SMTP_SERVER: "{{ .Values.smtp.hostname }}"
diff --git a/mastodon/values.yaml b/mastodon/values.yaml
index 125d5ec..ff28607 100644
--- a/mastodon/values.yaml
+++ b/mastodon/values.yaml
@@ -17,7 +17,7 @@ web:
memory: 64Mi
streaming:
- repository: tootsuite/mastodon
+ repository: tootsuite/mastodon-streaming
pullPolicy: Always
tag: ""
resources:
@@ -52,6 +52,10 @@ keys:
# Generate with `rake mastodon:webpush:generate_vapid_key`
vapidPrivate: ""
vapidPublic: ""
+ # Generate with `bin/rails db:encryption:init`
+ encryptionDeterministicKey: ""
+ encryptionDerivationSalt: ""
+ encryptionPrimaryKey: ""
redis:
hostname: "example.com"
--
GitLab