From 0f4e1e488a34c2e148dcb1e4b164ce7dc841a3d8 Mon Sep 17 00:00:00 2001 From: Maximilian Marschall Date: Wed, 29 Mar 2023 03:02:29 +0800 Subject: [PATCH] remove mariadb and mysql from _helpers.tpl (#421) ### Description of the change Removes checks for mariadb and mysql from _helpers.tpl ### Benefits Fixes the helm-chart version 8.0.0 if using a external database ### Applicable issues - fixes #420 - fixes #419 Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/421 Reviewed-by: justusbunsi Reviewed-by: John Olheiser Reviewed-by: delvh Reviewed-by: yardenshoham Co-authored-by: Maximilian Marschall Co-committed-by: Maximilian Marschall --- templates/_helpers.tpl | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 1732bd2..f8078ff 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -287,22 +287,6 @@ https {{- $_ := set .Values.gitea.config.database "NAME" .Values.postgresql.global.postgresql.auth.database -}} {{- $_ := set .Values.gitea.config.database "USER" .Values.postgresql.global.postgresql.auth.username -}} {{- $_ := set .Values.gitea.config.database "PASSWD" .Values.postgresql.global.postgresql.auth.password -}} - {{- else if .Values.mysql.enabled -}} - {{- $_ := set .Values.gitea.config.database "DB_TYPE" "mysql" -}} - {{- if not (.Values.gitea.config.database.HOST) -}} - {{- $_ := set .Values.gitea.config.database "HOST" (include "mysql.dns" .) -}} - {{- end -}} - {{- $_ := set .Values.gitea.config.database "NAME" .Values.mysql.db.name -}} - {{- $_ := set .Values.gitea.config.database "USER" .Values.mysql.db.user -}} - {{- $_ := set .Values.gitea.config.database "PASSWD" .Values.mysql.db.password -}} - {{- else if .Values.mariadb.enabled -}} - {{- $_ := set .Values.gitea.config.database "DB_TYPE" "mysql" -}} - {{- if not (.Values.gitea.config.database.HOST) -}} - {{- $_ := set .Values.gitea.config.database "HOST" (include "mariadb.dns" .) -}} - {{- end -}} - {{- $_ := set .Values.gitea.config.database "NAME" .Values.mariadb.auth.database -}} - {{- $_ := set .Values.gitea.config.database "USER" .Values.mariadb.auth.username -}} - {{- $_ := set .Values.gitea.config.database "PASSWD" .Values.mariadb.auth.password -}} {{- end -}} {{- end -}}