Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Mar 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9b4318
fix(database): use existing db port instead of default
Mar 27, 2024
3ad4a74
fix(lint): version bump
Mar 27, 2024
2abffce
chore: Update 'README.md's
Dominic-Beer Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/4allportal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/4allportal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions charts/4allportal/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand Down