From a0f12a2c481bf6e01598e1cb5bfdd4650aa96689 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 23 Oct 2019 22:53:48 +0300
Subject: [PATCH] Add postgres as an optional dependency

---
 helm/mautrix-telegram/.gitignore               |  1 +
 helm/mautrix-telegram/requirements.lock        |  6 ++++++
 helm/mautrix-telegram/requirements.yaml        |  5 +++++
 helm/mautrix-telegram/templates/configmap.yaml |  6 +++++-
 helm/mautrix-telegram/values.yaml              | 17 ++++++++++-------
 5 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 helm/mautrix-telegram/.gitignore
 create mode 100644 helm/mautrix-telegram/requirements.lock
 create mode 100644 helm/mautrix-telegram/requirements.yaml

diff --git a/helm/mautrix-telegram/.gitignore b/helm/mautrix-telegram/.gitignore
new file mode 100644
index 00000000..e6b3ed64
--- /dev/null
+++ b/helm/mautrix-telegram/.gitignore
@@ -0,0 +1 @@
+charts/*
diff --git a/helm/mautrix-telegram/requirements.lock b/helm/mautrix-telegram/requirements.lock
new file mode 100644
index 00000000..c8aa53ac
--- /dev/null
+++ b/helm/mautrix-telegram/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: postgresql
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  version: 6.5.0
+digest: sha256:85139e9d4207e49c11c5f84d7920d0135cffd3d427f3f3638d4e51258990de2a
+generated: "2019-10-23T22:11:37.005827507+03:00"
diff --git a/helm/mautrix-telegram/requirements.yaml b/helm/mautrix-telegram/requirements.yaml
new file mode 100644
index 00000000..1545fe2e
--- /dev/null
+++ b/helm/mautrix-telegram/requirements.yaml
@@ -0,0 +1,5 @@
+dependencies:
+  - name: postgresql
+    version: 6.5.0
+    repository: https://kubernetes-charts.storage.googleapis.com/
+    condition: postgresql.enabled
diff --git a/helm/mautrix-telegram/templates/configmap.yaml b/helm/mautrix-telegram/templates/configmap.yaml
index d7d9a0af..bbdb5c15 100644
--- a/helm/mautrix-telegram/templates/configmap.yaml
+++ b/helm/mautrix-telegram/templates/configmap.yaml
@@ -21,7 +21,11 @@ data:
       port: {{ .Values.service.port }}
       max_body_size: {{ .Values.appservice.maxBodySize }}
 
-      database: {{ .Values.appservice.database }}
+      {{- if .Values.postgresql.enabled }}
+      database: "postgres://postgres:{{ .Values.postgresql.postgresqlPassword }}@{{ .Release.Name }}-postgresql/{{ .Values.postgresql.postgresqlDatabase }}"
+      {{- else }}
+      database: {{ .Values.appservice.database | quote }}
+      {{- end }}
 
       public:
         {{- toYaml .Values.appservice.public | nindent 8 }}
diff --git a/helm/mautrix-telegram/values.yaml b/helm/mautrix-telegram/values.yaml
index 9e4fde17..8b579514 100644
--- a/helm/mautrix-telegram/values.yaml
+++ b/helm/mautrix-telegram/values.yaml
@@ -45,16 +45,19 @@ homeserver:
   # Only applies if address starts with https://
   verifySSL: true
 
+postgresql:
+  enabled: true
+  postgresqlDatabase: mxtg
+  persistence:
+    size: 8Gi
+  resources:
+    requests:
+      memory: 256Mi
+      cpu: 100m
+
 # Application service host/registration related details
 # Changing these values requires regeneration of the registration.
 appservice:
-  # The full URI to the database. SQLite and Postgres are fully supported.
-  # Other DBMSes supported by SQLAlchemy may or may not work.
-  # Format examples:
-  #   SQLite:   sqlite:///filename.db
-  #   Postgres: postgres://username:password@hostname/dbname
-  database: postgres://username:password@hostname/dbname
-
   # The maximum body size of appservice API requests (from the homeserver) in mebibytes
   # Usually 1 is enough, but on high-traffic bridges you might need to increase this to avoid 413s
   maxBodySize: 1