fix(database): use existing db port instead of default (#229)

* fix(database): use existing db port instead of default * fix(lint): version bump * chore: Update 'README.md's --------- Co-authored-by: d.beer@4allportal.com <d.beer@4allportal.com> Co-authored-by: Dominic-Beer <Dominic-Beer@users.noreply.github.com>
4ALLPORTAL · Mar 27, 2024 · 489d06d · 489d06d
1 parent 8efb89f
commit 489d06d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/charts/4allportal/Chart.yaml b/charts/4allportal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.10.38"
 description: A Helm chart for 4ALLPORTAL version 3.10.0 and up
 name: 4allportal
-version: 20.0.4
+version: 20.0.5
 icon: https://4allportal.com/wp-content/uploads/2022/07/cropped-4ap_logo.png
 keywords:
   - 4ALLPORTAL

diff --git a/charts/4allportal/README.md b/charts/4allportal/README.md
@@ -1,6 +1,6 @@
 # 4allportal
 
-![Version: 20.0.4](https://img.shields.io/badge/Version-20.0.4-informational?style=flat-square) ![AppVersion: 3.10.38](https://img.shields.io/badge/AppVersion-3.10.38-informational?style=flat-square)
+![Version: 20.0.5](https://img.shields.io/badge/Version-20.0.5-informational?style=flat-square) ![AppVersion: 3.10.38](https://img.shields.io/badge/AppVersion-3.10.38-informational?style=flat-square)
 
 A Helm chart for 4ALLPORTAL version 3.10.0 and up
 

diff --git a/charts/4allportal/templates/_helpers.tpl b/charts/4allportal/templates/_helpers.tpl
@@ -55,15 +55,15 @@ mariadb
 {{- end -}}
 
 {{- define  "4allportal.fourallportal.database.port" -}}
-{{- if or .Values.maxscale.enabled (not .Values.fourAllPortal.database.operator.enabled) (and (not .Values.fourAllPortal.database.existing.port) ((list "mysql" "mariadb") | has (include "4allportal.fourallportal.database.type" .))) -}}
-3306
-{{- else -}}
 {{- if .Values.fourAllPortal.database.operator.enabled }}
-{{- else -}}
+{{- else if or .Values.maxscale.enabled (and (not .Values.fourAllPortal.database.existing.port) ((list "mysql" "mariadb") | has (include "4allportal.fourallportal.database.type" .))) -}}
+3306
+{{- else if .Values.fourAllPortal.database.existing.port }}
+{{- .Values.fourAllPortal.database.existing.port -}}
+{{- else }}
 {{- required "Bundled DB deployment is disabled, please provide a port for the existing database" .Values.fourAllPortal.database.existing.port -}}
 {{- end -}}
 {{- end -}}
-{{- end -}}
 
 {{- define  "4allportal.fourallportal.database.name" -}}
 {{- if .Values.maxscale.enabled -}}