Skip to content

Commit 64eccea

Browse files
committed
support mariadb
1 parent a3806f7 commit 64eccea

6 files changed

Lines changed: 52 additions & 2 deletions

File tree

charts/codimd/Chart.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ dependencies:
1515
version: 8.6.10
1616
condition: postgresql.enabled, global.postgresql.enabled
1717
repository: https://charts.bitnami.com/bitnami
18+
- name: mariadb
19+
version: 7.3.16
20+
condition: mariadb.enabled, global.mariadb.enabled
21+
repository: https://charts.bitnami.com/bitnami

charts/codimd/requirements.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ dependencies:
22
- name: postgresql
33
repository: https://charts.bitnami.com/bitnami
44
version: 8.6.10
5-
digest: sha256:bcf451cb7316ebf38ba4769d636299bf4f5f639922a39355d78e7fad58901d83
6-
generated: "2020-03-31T05:06:22.8997+08:00"
5+
- name: mariadb
6+
repository: https://charts.bitnami.com/bitnami
7+
version: 7.3.16
8+
digest: sha256:2888f71590a564fb34afdacbee86a5c71a3a74107cb61d3328fdaaf15c545c45
9+
generated: "2020-03-31T10:20:46.491342+08:00"

charts/codimd/requirements.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ dependencies:
33
version: 8.6.10
44
condition: postgresql.enabled, global.postgresql.enabled
55
repository: https://charts.bitnami.com/bitnami
6+
- name: mariadb
7+
version: 7.3.16
8+
condition: mariadb.enabled, global.mariadb.enabled
9+
repository: https://charts.bitnami.com/bitnami

charts/codimd/templates/_helpers.tpl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,21 @@ Embedded PostgreSQL service name
7373
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
7474
{{- end -}}
7575
{{- end -}}
76+
{{- end -}}
77+
78+
79+
{{/*
80+
Embedded MariaDB service name
81+
*/}}
82+
{{- define "codimd.mariadb-svc" -}}
83+
{{- if .Values.mariadb.fullnameOverride -}}
84+
{{- .Values.mariadb.fullnameOverride | trunc 63 | trimSuffix "-" -}}
85+
{{- else -}}
86+
{{- $name := default "mariadb" .Values.mariadb.nameOverride -}}
87+
{{- if contains $name .Release.Name -}}
88+
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
89+
{{- else -}}
90+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
91+
{{- end -}}
92+
{{- end -}}
7693
{{- end -}}

charts/codimd/templates/db-secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
stringData:
66
{{ if .Values.postgresql.enabled }}
77
connection: "postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{ template "codimd.postgresql-svc" . }}/{{ .Values.postgresql.postgresqlDatabase }}"
8+
{{ else if .Values.mariadb.enabled }}
9+
connection: "mysql://{{ .Values.mariadb.db.user }}:{{ .Values.mariadb.db.password }}@{{ template "codimd.mariadb-svc" . }}/{{ .Values.mariadb.db.name }}"
810
{{ else }}
911
connection: "{{ .Values.codimd.database.type }}://{{ .Values.codimd.database.username }}:{{ .Values.codimd.database.password }}@{{ .Values.codimd.database.host }}:{{ .Values.codimd.database.port }}/{{ .Values.codimd.database.databaseName }}"
1012
{{ end }}

charts/codimd/values.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ postgresql:
2727
postgresqlUsername: codimd
2828
postgresqlPassword: changeme
2929
postgresqlDatabase: codimd
30+
##
31+
## MariaDB chart configuration
32+
##
33+
## Reference: https://github.com/bitnami/charts/blob/master/bitnami/mariadb/values.yaml
34+
##
35+
## If you prefer MariaDB, we also supported.
36+
##
37+
mariadb:
38+
enabled: false
39+
volumePermissions:
40+
enabled: true
41+
db:
42+
user: codimd
43+
password: changeme
44+
name: codimd
45+
master:
46+
persistence:
47+
enabled: true
48+
replication:
49+
enabled: false
3050

3151

3252
##

0 commit comments

Comments
 (0)