From 0498b106c9d632d761dc556e9d471eb6aec846c5 Mon Sep 17 00:00:00 2001
From: Alex Nordlund <deep.alexander@gmail.com>
Date: Sat, 5 Nov 2022 17:29:20 +0100
Subject: Add S3 existing secret to sidekiq (#19778)

---
 chart/templates/deployment-sidekiq.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'chart')

diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index 56ba257b5..4b108d79d 100644
--- a/chart/templates/deployment-sidekiq.yaml
+++ b/chart/templates/deployment-sidekiq.yaml
@@ -82,6 +82,18 @@ spec:
                 secretKeyRef:
                   name: {{ template "mastodon.redis.secretName" . }}
                   key: redis-password
+            {{- if (and .Values.mastodon.s3.enabled .Values.mastodon.s3.existingSecret) }}
+            - name: "AWS_SECRET_ACCESS_KEY"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.mastodon.s3.existingSecret }}
+                  key: AWS_SECRET_ACCESS_KEY
+            - name: "AWS_ACCESS_KEY_ID"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.mastodon.s3.existingSecret }}
+                  key: AWS_ACCESS_KEY_ID
+            {{- end -}}
             {{- if .Values.mastodon.smtp.existingSecret }}
             - name: "SMTP_LOGIN"
               valueFrom:
-- 
cgit 


From c64be9758f7e0c078ac8c6d27ec383b14253e3e0 Mon Sep 17 00:00:00 2001
From: Moritz Hedtke <Moritz.Hedtke@t-online.de>
Date: Sat, 5 Nov 2022 21:19:25 +0100
Subject: helm: Add documentation to run tootctl commands (#19791)

---
 chart/readme.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'chart')

diff --git a/chart/readme.md b/chart/readme.md
index 381037cc1..edcc973bc 100644
--- a/chart/readme.md
+++ b/chart/readme.md
@@ -19,6 +19,20 @@ The variables that _must_ be configured are:
 
 - SMTP settings for your mailer in the `mastodon.smtp` group.
 
+# Administration
+
+You can run [admin CLI](https://docs.joinmastodon.org/admin/tootctl/) commands in the web deployment.
+
+```bash
+kubectl -n mastodon exec -it deployment/mastodon-web -- bash
+tootctl accounts modify admin --reset-password
+```
+
+or
+```bash
+kubectl -n mastodon exec -it deployment/mastodon-web -- tootctl accounts modify admin --reset-password
+```
+
 # Missing features
 
 Currently this chart does _not_ support:
-- 
cgit