matrix: use resource renderer
diff --git a/core/installer/values-tmpl/matrix-storage.yaml b/core/installer/values-tmpl/matrix-storage.yaml
index 47ee9c0..7a4c129 100644
--- a/core/installer/values-tmpl/matrix-storage.yaml
+++ b/core/installer/values-tmpl/matrix-storage.yaml
@@ -6,34 +6,34 @@
spec:
chart:
spec:
- chart: postgresql
- version: 10.13.5
+ chart: charts/postgresql
sourceRef:
- kind: HelmRepository
- name: bitnami
- namespace: {{ .Values.Id }}
+ kind: GitRepository
+ name: pcloud
+ namespace: {{ .Global.Id }}
interval: 1m0s
values:
fullnameOverride: postgres
image:
- repository: arm64v8/postgres
- tag: 13.4
+ repository: library/postgres # arm64v8/postgres
+ tag: 15.3 # 13.4
service:
type: ClusterIP
port: 5432
- postgresqlPassword: psswd
- initdbScripts:
- createdb.sh: |
- #!/bin/sh
- createdb -U postgres --encoding=UTF8 --locale=C --template=template0 --owner=postgres matrix
- persistence:
- size: {{ .Values.MatrixStorageSize }}
- securityContext:
- enabled: true
- fsGroup: 0
- containerSecurityContext:
- enabled: true
- runAsUser: 0
+ primary:
+ initdb:
+ scripts:
+ init.sql: |
+ CREATE USER matrix WITH PASSWORD 'matrix';
+ CREATE DATABASE matrix WITH OWNER = matrix ENCODING = UTF8 LOCALE = C TEMPLATE = template0;
+ persistence:
+ size: 10Gi
+ securityContext:
+ enabled: true
+ fsGroup: 0
+ containerSecurityContext:
+ enabled: true
+ runAsUser: 0
volumePermissions:
securityContext:
runAsUser: 0
diff --git a/core/installer/values-tmpl/matrix.jsonschema b/core/installer/values-tmpl/matrix.jsonschema
index ec6a2c5..89f64ce 100644
--- a/core/installer/values-tmpl/matrix.jsonschema
+++ b/core/installer/values-tmpl/matrix.jsonschema
@@ -1,15 +1,7 @@
{
"type": "object",
"properties": {
- "Values": {
- "type": "object",
- "properties": {
- "NamespacePrefix": { "type": "string" },
- "Id": { "type": "string" },
- "Domain": { "type": "string" }
- },
- "additionalProperties": false
- }
+ "Subdomain": { "type": "string", "default": "matrix" }
},
"additionalProperties": false
}
diff --git a/core/installer/values-tmpl/matrix.yaml b/core/installer/values-tmpl/matrix.yaml
index d3e3a03..da459dc 100644
--- a/core/installer/values-tmpl/matrix.yaml
+++ b/core/installer/values-tmpl/matrix.yaml
@@ -17,18 +17,17 @@
interval: 1m0s
values:
domain: {{ .Global.Domain }}
+ subdomain: {{ .Values.Subdomain }}
oauth2:
hydraAdmin: http://hydra-admin.{{ .Global.NamespacePrefix }}core-auth.svc.cluster.local
hydraPublic: https://hydra.{{ .Global.Domain }}
- clientId: matrix
- clientSecret: {{ .Values.MatrixOAuth2ClientSecret }}
secretName: oauth2-client
postgresql:
host: postgres
port: 5432
database: matrix
- user: postgres
- password: psswd
+ user: matrix
+ password: matrix
certificateIssuer: {{ .Global.Id }}-public
ingressClassName: {{ .Global.PCloudEnvName }}-ingress-public
configMerge: