From 2eaee0e4b6e26d88b326354fe2118fa1787f8cc1 Mon Sep 17 00:00:00 2001
From: Pablo Galego <pgalego@vmware.com>
Date: Tue, 17 Aug 2021 11:27:06 +0200
Subject: [PATCH] [bitnami/redmine] fix port number setting for postgresql
 (#7236)

---
 bitnami/redmine/Chart.yaml                |  2 +-
 bitnami/redmine/templates/NOTES.txt       |  8 ++++++--
 bitnami/redmine/templates/_helpers.tpl    | 13 +++++++++++++
 bitnami/redmine/templates/deployment.yaml |  4 +---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bitnami/redmine/Chart.yaml b/bitnami/redmine/Chart.yaml
index fad58c86d8..fb14e88173 100644
--- a/bitnami/redmine/Chart.yaml
+++ b/bitnami/redmine/Chart.yaml
@@ -36,4 +36,4 @@ name: redmine
 sources:
   - https://github.com/bitnami/bitnami-docker-redmine
   - http://www.redmine.org/
-version: 17.0.2
+version: 17.0.3
diff --git a/bitnami/redmine/templates/NOTES.txt b/bitnami/redmine/templates/NOTES.txt
index 178519f019..c48717f827 100644
--- a/bitnami/redmine/templates/NOTES.txt
+++ b/bitnami/redmine/templates/NOTES.txt
@@ -57,8 +57,12 @@ You have 4 alternatives:
   echo Username: $REDMINE_USERNAME
   echo Password: $REDMINE_PASSWORD
 
-   You can access the DB using the following password:
-   {{ include "common.utils.secret.getvalue" (dict "secret" $dbSecretName "field" "mariadb-password" "context" $) }}
+  You can access the DB using the following password:
+  {{- if eq .Values.databaseType "mariadb" }}
+  {{ include "common.utils.secret.getvalue" (dict "secret" $dbSecretName "field" "mariadb-password" "context" $) }}
+  {{- else if eq .Values.databaseType "postgresql" }}
+  {{ include "common.utils.secret.getvalue" (dict "secret" $dbSecretName "field" "postgresql-password" "context" $) }}
+  {{ end }}
 {{- end }}
 
 {{- include "common.warnings.rollingTag" .Values.image }}
diff --git a/bitnami/redmine/templates/_helpers.tpl b/bitnami/redmine/templates/_helpers.tpl
index 1f4c9c8ead..2bf17567ab 100644
--- a/bitnami/redmine/templates/_helpers.tpl
+++ b/bitnami/redmine/templates/_helpers.tpl
@@ -105,6 +105,19 @@ Return the database host for Redmine
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the database port for Redmine
+*/}}
+{{- define "redmine.database.port" -}}
+{{- if and (eq .Values.databaseType "mariadb") (.Values.mariadb.enabled) -}}
+    {{- printf "3306" -}}
+{{- else if and (eq .Values.databaseType "postgresql") (.Values.postgresql.enabled) -}}
+    {{- printf "5432" -}}
+{{- else }}
+    {{- .Values.externalDatabase.port }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the database name for Redmine
 */}}
diff --git a/bitnami/redmine/templates/deployment.yaml b/bitnami/redmine/templates/deployment.yaml
index 1e54291c57..84fb820ead 100644
--- a/bitnami/redmine/templates/deployment.yaml
+++ b/bitnami/redmine/templates/deployment.yaml
@@ -121,10 +121,8 @@ spec:
                   {{- else }}
                   key: postgresql-password
                   {{- end }}
-            {{- if (include "redmine.useExternalDB" .) }}
             - name: REDMINE_DATABASE_PORT_NUMBER
-              value: {{ .Values.externalDatabase.port | quote }}
-            {{- end }}
+              value: {{ include "redmine.database.port" . | quote }}
             - name: REDMINE_USERNAME
               value: {{ default "" .Values.redmineUsername | quote }}
             - name: REDMINE_PASSWORD