diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a02b0..d6e84f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 6.3.1 + +- Removed DB_POOL from the ConfigMap as we should never have to override this. + # 6.3.0 - Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up. diff --git a/Chart.yaml b/Chart.yaml index 33382cf..bda99a2 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,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: 6.3.0 +version: 6.3.1 # 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 diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index d07e2ad..9539b26 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -270,18 +270,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 */}} diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml index ad0a0a9..b6b8e7c 100644 --- a/templates/configmap-env.yaml +++ b/templates/configmap-env.yaml @@ -8,7 +8,6 @@ data: DB_HOST: {{ template "mastodon.postgres.host" . }} DB_PORT: {{ template "mastodon.postgres.port" . }} DB_NAME: {{ .Values.postgresql.auth.database }} - DB_POOL: {{ include "mastodon.maxDbPool" . }} DB_USER: {{ .Values.postgresql.auth.username }} {{- if .Values.postgresql.readReplica.hostname }} REPLICA_DB_HOST: {{ .Values.postgresql.readReplica.hostname }}