3
0
mirror of https://github.com/mastodon/chart synced 2025-05-17 20:43:21 +00:00

Change default Secret name to not rely on Bitnami

Replace common.names.fullname in the default Secret name template with mastodon.fullname

This removes all Bitnami dependencies for installs not using the Bitnami PostgreSQL, Redis, and Elasticsearch. Those charts populate the common.names.fullname template value. Installs not using these charts will receive an error. Instead, use mastodon.fullname like in secrets.yaml.

Fix mastodon/chart#60
Fix mastodon/chart#65
This commit is contained in:
Jeremiah Lee 2023-07-20 11:41:08 +02:00
parent 4b6fd9f7e6
commit 4d418e97eb
2 changed files with 4 additions and 4 deletions

View File

@ -96,7 +96,7 @@ Get the mastodon secret.
{{- if .Values.mastodon.secrets.existingSecret }}
{{- printf "%s" (tpl .Values.mastodon.secrets.existingSecret $) -}}
{{- else -}}
{{- printf "%s" (include "common.names.fullname" .) -}}
{{- printf "%s" (include "mastodon.fullname" .) -}}
{{- end -}}
{{- end -}}
@ -107,7 +107,7 @@ Get the smtp secret.
{{- if .Values.mastodon.smtp.existingSecret }}
{{- printf "%s" (tpl .Values.mastodon.smtp.existingSecret $) -}}
{{- else -}}
{{- printf "%s-smtp" (include "common.names.fullname" .) -}}
{{- printf "%s-smtp" (include "mastodon.fullname" .) -}}
{{- end -}}
{{- end -}}
@ -120,7 +120,7 @@ Get the postgresql secret.
{{- else if .Values.postgresql.enabled -}}
{{- printf "%s-postgresql" (tpl .Release.Name $) -}}
{{- else -}}
{{- printf "%s" (include "common.names.fullname" .) -}}
{{- printf "%s" (include "mastodon.fullname" .) -}}
{{- end -}}
{{- end -}}

View File

@ -2,7 +2,7 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-smtp" (include "common.names.fullname" .) }}
name: {{ printf "%s-smtp" (include "mastodon.fullname" .) }}
labels:
{{- include "mastodon.labels" . | nindent 4 }}
type: Opaque