Merge pull request #3 from jessebot/fix/admin-creation-job

fix admin creation job; add some notes

README.md

@@ -1,13 +1,15 @@
 # Introduction
 
-This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
+This is a [Helm](https://helm.sh/) chart for installing Mastodon on a Kubernetes cluster. This is a fork of the official mastodon helm chart, as the upstream repo had some issues with security and order of operations.
-Kubernetes cluster.  The basic usage is:
+The basic usage is:
 
 1. edit `values.yaml` or create a separate yaml file for custom values
-1. `helm dep update`
+2. `helm repo add https://jessebot.github.io/mastodon-helm-chart`
-1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
+3. `helm install --namespace mastodon --create-namespace mastodon -f path/to/values.yaml`
 
-This chart is tested with k8s 1.21+ and helm 3.6.0+.
+This chart is tested with k8s 1.26+ and helm 3.6.0+.
+
+Known caveats: Currently in chart version `4.0.8`, you need to run postgresql and redis helm charts independently of this one. This is because there's a helm hook job called db-migrate that I can't figure out how to make run after the dependency charts are fully installed, but before everything else. If you know the answer to this, please open an issue here and let me know!
 
 # Configuration
 

charts/mastodon/Chart.yaml

@@ -15,7 +15,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: 4.0.7
+version: 4.0.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/mastodon/templates/job-create-admin.yaml

@@ -47,15 +47,9 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy | default "IfNotPresent" }}
           command:
-            - bin/tootctl
+            - /bin/bash
-            - accounts
+            - -c
-            - create
+            - bin/tootctl accounts create "$ADMIN_USER" --email "$ADMIN_EMAIL" --confirmed --role Owner
-            - $ADMIN_USER
-            - --email
-            - $ADMIN_EMAIL 
-            - --confirmed
-            - --role
-            - Owner
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env