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

Remove DB_POOL from configuration (#190)

This commit is contained in:
Tim Campbell 2025-04-17 11:28:18 +02:00 committed by GitHub
parent 56e36d266c
commit 0ebd318105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 14 deletions

View File

@ -1,3 +1,7 @@
# 6.3.1
- Removed DB_POOL from the ConfigMap as we should never have to override this.
# 6.3.0 # 6.3.0
- Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up. - Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up.

View File

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time # 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. # you make changes to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 6.3.0 version: 6.3.1
# This is the version number of the application being deployed. This version number should be # 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 # incremented each time you make changes to the application. Versions are not expected to

View File

@ -270,18 +270,6 @@ Return true if a mastodon secret object should be created
{{- end -}} {{- end -}}
{{- 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 Full hostname for a custom Elasticsearch cluster
*/}} */}}

View File

@ -8,7 +8,6 @@ data:
DB_HOST: {{ template "mastodon.postgres.host" . }} DB_HOST: {{ template "mastodon.postgres.host" . }}
DB_PORT: {{ template "mastodon.postgres.port" . }} DB_PORT: {{ template "mastodon.postgres.port" . }}
DB_NAME: {{ .Values.postgresql.auth.database }} DB_NAME: {{ .Values.postgresql.auth.database }}
DB_POOL: {{ include "mastodon.maxDbPool" . }}
DB_USER: {{ .Values.postgresql.auth.username }} DB_USER: {{ .Values.postgresql.auth.username }}
{{- if .Values.postgresql.readReplica.hostname }} {{- if .Values.postgresql.readReplica.hostname }}
REPLICA_DB_HOST: {{ .Values.postgresql.readReplica.hostname }} REPLICA_DB_HOST: {{ .Values.postgresql.readReplica.hostname }}