broken

charts/mastodon/dev-values.yaml

@@ -1,3 +1,6 @@
+nameOverride: ""
+fullnameOverride: ""
+
 # Chart values used for testing the Helm chart.
 #
 image:
@@ -12,8 +15,8 @@ image:
   pullPolicy: IfNotPresent
 
 mastodon:
-  # -- create an initial administrator user; the password is autogenerated and will
+  # -- create an initial administrator user; the password is autogenerated and 
-  # have to be reset
+  # will have to be reset
   createAdmin:
     # @ignored
     enabled: false
@@ -21,7 +24,7 @@ mastodon:
     username: not_gargron
     # @ignored
     email: not@example.commit
-    # existingSecret: mastodon-admin
+    existingSecret: ""
     # secretKeys:
     #   usernameKey: username
     #   passwordKey: password
@@ -93,11 +96,6 @@ mastodon:
     # with keys SECRET_KEY_BASE and OTP_SECRET and
     # VAPID_PRIVATE_KEY and VAPID_PUBLIC_KEY
     # existingSecret: ""
-    # secretKeys:
-    #   vapidPrivateKey: VAPID_PRIVATE_KEY
-    #   vapidPublicKey: VAPID_PUBLIC_KEY
-    #   secretKeyBase: SECRET_KEY_BASE
-    #   otpSecret: OTP_SECRET
 
   sidekiq:
     # -- Pod security context for all Sidekiq Pods, overwrites .Values.podSecurityContext
@@ -167,7 +165,7 @@ mastodon:
     password:
     # -- Instead of defining login/password above, you can specify the name of an existing secret here. Login and
     # password must be located in keys named `login` and `password` respectively.
-    existingSecret:
+    existingSecret: ""
   streaming:
     port: 4000
     # -- this should be set manually since os.cpus() returns the number of CPUs on

charts/mastodon/templates/_helpers.tpl

@@ -58,7 +58,7 @@ Rolling pod annotations
 {{- if .Values.revisionPodAnnotation }}
 rollme: {{ .Release.Revision | quote }}
 {{- end }}
-checksum/config-secrets: {{ include ( print $.Template.BasePath "/secret-mastodon.yaml" ) . | sha256sum | quote }}
+checksum/config-secrets: {{ include ( print $.Template.BasePath "/secret.yaml" ) . | sha256sum | quote }}
 checksum/config-configmap: {{ include ( print $.Template.BasePath "/configmap-env.yaml" ) . | sha256sum | quote }}
 {{- end }}
 
@@ -89,16 +89,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Get the mastodon secret.
-*/}}
 {{- define "mastodon.secretName" -}}
-{{- if .Values.mastodon.secrets.existingSecret }}
+{{- default "secret" .Values.mastodon.secrets.existingSecret }}
-    {{- printf "%s" (tpl .Values.mastodon.secrets.existingSecret $) -}}
+{{- end }}
-{{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
-{{- end -}}
-{{- end -}}
 
 {{/*
 Get the smtp secret.

charts/mastodon/templates/cronjob-media-remove.yaml

@@ -52,33 +52,9 @@ spec:
               envFrom:
                 - configMapRef:
                     name: {{ include "mastodon.fullname" . }}-env
-                {{- if not .Values.mastodon.secrets.existingSecret }}
                 - secretRef:
                     name: {{ template "mastodon.secretName" . }}
-                {{- end }}
               env:
-                {{- if .Values.mastodon.secrets.existingSecret }}
-                - name: "SECRET_KEY_BASE"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ .Values.mastodon.secrets.existingSecret }}
-                      key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-                - name: "OTP_SECRET"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ .Values.mastodon.secrets.existingSecret }}
-                      key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-                - name: "VAPID_PRIVATE_KEY"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ .Values.mastodon.secrets.existingSecret }}
-                      key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-                - name: "VAPID_PUBLIC_KEY"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ .Values.mastodon.secrets.existingSecret }}
-                      key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-                {{- end }}
                 - name: "DB_PASS"
                   valueFrom:
                     secretKeyRef:

charts/mastodon/templates/deployment-sidekiq.yaml

@@ -82,33 +82,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" $context }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:

charts/mastodon/templates/deployment-web.yaml

@@ -63,33 +63,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:

charts/mastodon/templates/job-assets-precompile.yaml

@@ -53,33 +53,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:

charts/mastodon/templates/job-chewy-upgrade.yaml

@@ -54,33 +54,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:

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

@@ -53,33 +53,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "ADMIN_USER"
               {{- if .Values.mastodon.createAdmin.existingSecret }}
               valueFrom:

charts/mastodon/templates/job-db-migrate.yaml

@@ -52,33 +52,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
-            {{- if not .Values.mastodon.secrets.existingSecret }}
             - secretRef:
                 name: {{ template "mastodon.secretName" . }}
-            {{- end }}
           env:
-            {{- if .Values.mastodon.secrets.existingSecret }}
-            - name: "SECRET_KEY_BASE"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.secretKeyBase }}
-            - name: "OTP_SECRET"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.optSecret }}
-            - name: "VAPID_PRIVATE_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPrivateKey }}
-            - name: "VAPID_PUBLIC_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.secrets.existingSecret }}
-                  key: {{ .Values.mastodon.secrets.secretKeys.vapidPublicKey }}
-            {{- end }}
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:

charts/mastodon/values.yaml

@@ -1,3 +1,6 @@
+nameOverride: ""
+fullnameOverride: ""
+
 image:
   repository: ghcr.io/mastodon/mastodon
   # https://github.com/mastodon/mastodon/pkgs/container/mastodon
@@ -19,11 +22,11 @@ mastodon:
     username: not_gargron
     # @ignored
     email: not@example.commit
-    # existingSecret: mastodon-admin
+    existingSecret: ""
-    # secretKeys:
+    secretKeys:
-    #   usernameKey: username
+      usernameKey: username
-    #   passwordKey: password
+      passwordKey: password
-    #   emailKey: email
+      emailKey: email
   cron:
     # -- run `tootctl media remove` every week
     removeMedia:
@@ -88,12 +91,12 @@ mastodon:
       private_key: ""
       public_key: ""
     # -- you can also specify the name of an existing Secret
+    # keys must be:
+    # VAPID_PRIVATE_KEY
+    # VAPID_PUBLIC_KEY
+    # SECRET_KEY_BASE
+    # OTP_SECRET
     existingSecret: ""
-    secretKeys:
-      vapidPrivateKey: VAPID_PRIVATE_KEY
-      vapidPublicKey: VAPID_PUBLIC_KEY
-      secretKeyBase: SECRET_KEY_BASE
-      otpSecret: OTP_SECRET
 
   sidekiq:
     # -- Pod security context for all Sidekiq Pods, overwrites .Values.podSecurityContext
@@ -163,7 +166,7 @@ mastodon:
     password:
     # -- Instead of defining login/password above, you can specify the name of an existing secret here. Login and
     # password must be located in keys named `login` and `password` respectively.
-    existingSecret:
+    existingSecret: ""
   streaming:
     port: 4000
     # -- this should be set manually since os.cpus() returns the number of CPUs on
@@ -296,7 +299,7 @@ redis:
     password: ""
     # you can also specify the name of an existing Secret
     # with a key of redis-password set to the password you want
-    # existingSecret: ""
+    existingSecret: ""
 
 # @ignored
 service: