From 489d06d13c8b979a975abdd672aa1fc67b99e202 Mon Sep 17 00:00:00 2001 From: Dominic-Beer <126061923+Dominic-Beer@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:54:13 +0100 Subject: [PATCH] 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 Co-authored-by: Dominic-Beer --- charts/4allportal/Chart.yaml | 2 +- charts/4allportal/README.md | 2 +- charts/4allportal/templates/_helpers.tpl | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/4allportal/Chart.yaml b/charts/4allportal/Chart.yaml index 1913c7d4..30204361 100644 --- 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 index 2561a9ba..192f22c1 100644 --- 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 index 51a78b6b..321c9396 100644 --- 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 -}}