Merge pull request #150 from small-hack/fix-db-env-vars

Fix db env vars

Author: jessebot

charts/mastodon/Chart.yaml

@@ -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: 11.0.0
+version: 11.0.1
 
 # renovate: image=ghcr.io/mastodon/mastodon
 appVersion: v4.4.4

charts/mastodon/README.md

@@ -1,6 +1,6 @@
 # mastodon
 
-![Version: 11.0.0](https://img.shields.io/badge/Version-11.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.4](https://img.shields.io/badge/AppVersion-v4.4.4-informational?style=flat-square)
+![Version: 11.0.1](https://img.shields.io/badge/Version-11.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.4](https://img.shields.io/badge/AppVersion-v4.4.4-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 

charts/mastodon/templates/_db-migrate.tpl

@@ -53,21 +53,15 @@ spec:
             - db:migrate
             {{- end }}
           envFrom:
+            - configMapRef:
+                name: {{ include "mastodon.fullname" . }}-env
             - secretRef:
                 {{- if and .prepare (not .Values.mastodon.secrets.existingSecret) }}
                 name: {{ template "mastodon.secretName" . }}-prepare
                 {{- else }}
                 name: {{ template "mastodon.secretName" . }}
                 {{- end }}
           env:
-            - name: "DB_HOST"
-              value: {{ template "mastodon.postgres.direct.host" . }}
-            - name: "DB_PORT"
-              value: {{ template "mastodon.postgres.direct.port" . }}
-            - name: "DB_NAME"
-              value: {{ template "mastodon.postgres.direct.database" . }}
-            - name: "DB_USER"
-              value: {{ .Values.postgresql.auth.username }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef: