Skip to content

Commit 3a544a3

Browse files
authored
fixing postgresql parameter to match bitnami's primary.initdb.scriptsConfigMap and updating ci to do a repo add of coturn subchart (#9)
1 parent 6728c3a commit 3a544a3

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

.github/workflows/ci-helm-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929

3030
- name: Add dependency chart repos
3131
run: |
32+
helm repo add coturn https://jessebot.github.io/coturn-chart/
3233
helm dep update charts/matrix
3334
3435
- name: Run chart-releaser

README.md

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
11
# Matrix Chart
22

3-
A Helm chart for deploying a Matrix homeserver stack in Kubernetes. This is a fork of [Arkaniad/matrix-chart](https://github.com/Arkaniad/matrix-chart), which is a fork of [typokign/matrix-chart](https://github.com/typokign/matrix-chart).
3+
A Helm chart for deploying a Matrix homeserver stack in Kubernetes. This is a fork of [Arkaniad/matrix-chart](https://github.com/Arkaniad/matrix-chart), which is a fork of [typokign/matrix-chart](https://github.com/typokign/matrix-chart).
44

5-
## Features
5+
## TLDR
66

7-
- Latest version of [Synapse](https://github.com/matrix-org/synapse)
8-
- Ingress definition for federated Synapse and Element
7+
See [charts/matrix/README.md](./charts/matrix/README.md) for docs auto-generated from the [`values.yaml`](./charts/matrix/values.yaml).
8+
Read through the parameters and modify them locally before installing the chart:
9+
10+
```bash
11+
helm repo add matrix https://jessebot.github.io/matrix-chart
12+
helm install my-release-name matrix --values values.yaml
13+
```
14+
15+
16+
## Current Features
17+
18+
- Latest version of [Synapse](https://github.com/matrix-org/synapse) (the official homeserver edition of matrix)
19+
- Ingress definitions for federated Synapse (Matrix homeserver) and Element (frontend and CMS for matrix)
20+
- Use (existing) Kubernetes Secrets for confidential data, such as passwords
21+
22+
### Optional Features
923

10-
### Opptional Features
1124
- Latest version of [Element](https://element.io/)
25+
- [Bitnami PostgreSQL subchart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) to deploy a cluster - needs some work to standardize though, so we also support external postgresql servers
26+
27+
#### ⚠️ Optional Features (Untested Since Fork)
28+
29+
These features still need to be tested, but are technically baked into the chart:
1230
- Choice of lightweight Exim relay or external mail server for email notifications
13-
- [Coturn TURN server sub-chart](https://github.com/jessebot/coturn-chart) for VoIP calls
14-
- [Bitnami PostgreSQL sub-chart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) to deploy a cluster - needs some work to standardize though, so we also support external postgresql servers
31+
- [Coturn TURN server subchart](https://github.com/jessebot/coturn-chart) for VoIP calls
32+
- [Half-Shot/matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord) Discord bridge
1533
- [matrix-org/matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) IRC bridge
1634
- [tulir/mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp) WhatsApp bridge
17-
- [Half-Shot/matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord) Discord bridge
18-
19-
## Installation
2035

21-
Some documentation is available in [`values.yaml`](./charts/matrix/values.yaml). See [charts/matrix/README.md](./charts/matrix/README.md) for docs auto-generated from the `values.yaml`.
2236

23-
###
37+
## Status
38+
This chart is now maintained mostly by me, @jessebot, but I'd love contributors as well! My goal is to provide regular updates using dependabot (maybe renovatebot soon) and provide some level of basic security from a k8s perspective. The aim as of right now has been removing any plaintext secrets and allowing for existing PVCs. I'm also trying to standardize the chart more by following predictable values.yaml patterns.
2439

25-
This is released normally, so you should be able to do:
26-
27-
```bash
28-
helm repo add matrix https://jessebot.github.io/matrix-chart
29-
helm repo update
30-
helm install my-release-name matrix
31-
```
40+
Note: I may stop supporting this if a larger entity maintains a better matrix chart (e.g. Bitnami releases a matrix helm chart), as then I'll just write PRs directly to them. At that time I'll put in a note in this README before publically archiving the repo.

charts/matrix/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sources:
88

99
type: application
1010

11-
version: 4.0.1
11+
version: 4.0.2
1212
appVersion: v1.88.0
1313

1414
maintainers:

charts/matrix/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# matrix
22

3-
![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.88.0](https://img.shields.io/badge/AppVersion-v1.88.0-informational?style=flat-square)
3+
![Version: 4.0.2](https://img.shields.io/badge/Version-4.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.88.0](https://img.shields.io/badge/AppVersion-v1.88.0-informational?style=flat-square)
44

55
A Helm chart to deploy a Matrix homeserver stack into Kubernetes
66

@@ -218,9 +218,9 @@ A Helm chart to deploy a Matrix homeserver stack into Kubernetes
218218
| postgresql.global.postgresql.auth.secretKeys.databaseUsername | string | `"username"` | key in existingSecret with username for matrix to connect to db |
219219
| postgresql.global.postgresql.auth.secretKeys.userPasswordKey | string | `"password"` | key in existingSecret with password for matrix to connect to db |
220220
| postgresql.global.postgresql.auth.username | string | `"matrix"` | username of matrix postgres user |
221-
| postgresql.primary.initdbScriptsConfigMap | string | `"{{ .Release.Name }}-postgresql-initdb"` | If postgresql.enabled, stable/postgresql will run the scripts in: templates/postgresql/initdb-configmap.yaml If using an external Postgres server, make sure to configure the database ref: https://github.com/matrix-org/synapse/blob/master/docs/postgres.md |
222-
| postgresql.primary.persistence | object | `{"enabled":true,"size":"8Gi"}` | persistent volume claim configuration for postgresql to persist data |
223-
| postgresql.primary.persistence.enabled | bool | `true` | Enable PostgreSQL Primary data persistence using PVC |
221+
| postgresql.primary.initdb | object | `{"scriptsConfigMap":"{{ .Release.Name }}-postgresql-initdb"}` | run the scripts in templates/postgresql/initdb-configmap.yaml If using an external Postgres server, make sure to configure the database ref: https://github.com/matrix-org/synapse/blob/master/docs/postgres.md |
222+
| postgresql.primary.persistence | object | `{"enabled":false,"size":"8Gi"}` | persistent volume claim configuration for postgresql to persist data |
223+
| postgresql.primary.persistence.enabled | bool | `false` | Enable PostgreSQL Primary data persistence using PVC |
224224
| postgresql.primary.persistence.size | string | `"8Gi"` | size of postgresql volume claim |
225225
| postgresql.primary.podSecurityContext.enabled | bool | `true` | |
226226
| postgresql.primary.podSecurityContext.fsGroup | int | `1000` | |

charts/matrix/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,15 @@ postgresql:
308308
# -- persistent volume claim configuration for postgresql to persist data
309309
persistence:
310310
# -- Enable PostgreSQL Primary data persistence using PVC
311-
enabled: true
311+
enabled: false
312312
# -- size of postgresql volume claim
313313
size: 8Gi
314314

315-
# -- If postgresql.enabled, stable/postgresql will run the scripts in:
316-
# templates/postgresql/initdb-configmap.yaml
315+
# -- run the scripts in templates/postgresql/initdb-configmap.yaml
317316
# If using an external Postgres server, make sure to configure the database
318317
# ref: https://github.com/matrix-org/synapse/blob/master/docs/postgres.md
319-
initdbScriptsConfigMap: "{{ .Release.Name }}-postgresql-initdb"
318+
initdb:
319+
scriptsConfigMap: "{{ .Release.Name }}-postgresql-initdb"
320320

321321
podSecurityContext:
322322
enabled: true

0 commit comments

Comments
 (0)