mastodon: bump to v4.4.1, helm chart v6.5.0
This commit is contained in:
@ -47,7 +47,9 @@ Common labels
|
||||
helm.sh/chart: {{ include "mastodon.chart" . }}
|
||||
{{ include "mastodon.selectorLabels" . }}
|
||||
{{ include "mastodon.globalLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
{{- if .Values.image.tag }}
|
||||
app.kubernetes.io/version: {{ regexReplaceAll "@(\\w+:\\w{0,7})\\w*" .Values.image.tag "@${1}" | quote }}
|
||||
{{- else if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
@ -90,7 +92,7 @@ Create the name of the assets persistent volume to use
|
||||
{{- if .Values.mastodon.persistence.assets.existingClaim }}
|
||||
{{- printf "%s" (tpl .Values.mastodon.persistence.assets.existingClaim $) -}}
|
||||
{{- else -}}
|
||||
{{- printf "%s-assets" (include "common.names.fullname" .) -}}
|
||||
{{- printf "%s-assets" (include "mastodon.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@ -101,7 +103,7 @@ Create the name of the system persistent volume to use
|
||||
{{- if .Values.mastodon.persistence.system.existingClaim }}
|
||||
{{- printf "%s" (tpl .Values.mastodon.persistence.system.existingClaim $) -}}
|
||||
{{- else -}}
|
||||
{{- printf "%s-system" (include "common.names.fullname" .) -}}
|
||||
{{- printf "%s-system" (include "mastodon.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@ -121,6 +123,60 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
||||
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Establish which values we will use for remote connections
|
||||
*/}}
|
||||
{{- define "mastodon.postgres.host" -}}
|
||||
{{- if .Values.postgresql.enabled }}
|
||||
{{- printf "%s" (include "mastodon.postgresql.fullname" .) -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" (required "When the postgresql chart is disabled .Values.postgresql.postgresqlHostname is required" .Values.postgresql.postgresqlHostname) -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{- define "mastodon.postgres.port" -}}
|
||||
{{- if .Values.postgresql.enabled }}
|
||||
{{- printf "%d" 5432 | int | quote -}}
|
||||
{{- else }}
|
||||
{{- printf "%d" | default 5432 .Values.postgresql.postgresqlPort | int | quote -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Establish which values we will use for direct remote DB connections
|
||||
*/}}
|
||||
{{- define "mastodon.postgres.direct.host" -}}
|
||||
{{- if .Values.postgresql.direct.hostname }}
|
||||
{{- printf "%s" .Values.postgresql.direct.hostname -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" (include "mastodon.postgres.host" .) -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{- define "mastodon.postgres.direct.port" -}}
|
||||
{{- if .Values.postgresql.direct.port }}
|
||||
{{- printf "%d" (int .Values.postgresql.direct.port) | quote -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" (include "mastodon.postgres.port" .) -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{- define "mastodon.postgres.direct.database" -}}
|
||||
{{- if .Values.postgresql.direct.database }}
|
||||
{{- printf "%s" .Values.postgresql.direct.database -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" .Values.postgresql.auth.database -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{- define "mastodon.redis.host" -}}
|
||||
{{- if .Values.redis.enabled }}
|
||||
{{- printf "%s-%s" (include "mastodon.redis.fullname" .) "master" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" (required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname) -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Get the mastodon secret.
|
||||
*/}}
|
||||
@ -133,7 +189,7 @@ Get the mastodon secret.
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Get the smtp secret.
|
||||
Get the smtp secrets.
|
||||
*/}}
|
||||
{{- define "mastodon.smtp.secretName" -}}
|
||||
{{- if .Values.mastodon.smtp.existingSecret }}
|
||||
@ -143,6 +199,14 @@ Get the smtp secret.
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mastodon.smtp.bulk.secretName" -}}
|
||||
{{- if .Values.mastodon.smtp.bulk.existingSecret }}
|
||||
{{- printf "%s" (tpl .Values.mastodon.smtp.bulk.existingSecret $) -}}
|
||||
{{- else -}}
|
||||
{{- printf "%s-smtp-bulk" (include "mastodon.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Get the postgresql secret.
|
||||
*/}}
|
||||
@ -214,18 +278,6 @@ Return true if a mastodon secret object should be created
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Find highest number of needed database connections to set DB_POOL variable
|
||||
*/}}
|
||||
{{- define "mastodon.maxDbPool" -}}
|
||||
{{/* Default MAX_THREADS for Puma is 5 */}}
|
||||
{{- $poolSize := 5 }}
|
||||
{{- range .Values.mastodon.sidekiq.workers }}
|
||||
{{- $poolSize = max $poolSize .concurrency }}
|
||||
{{- end }}
|
||||
{{- $poolSize | quote }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Full hostname for a custom Elasticsearch cluster
|
||||
*/}}
|
||||
|
Reference in New Issue
Block a user