commit 16f17e8fa12c410d4e600b3087bd50dc49b5fa99
parent 978cf9af35d505b350f2d43802d6399cd4e65562
Author: MTRNord <mtrnord1@gmail.com>
Date: Wed, 15 Jan 2025 18:45:26 +0100
Prepare gateway api for matrix HS
Diffstat:
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/apps/base/matrix/matrix-helm/repository.yaml b/apps/base/matrix/matrix-helm/repository.yaml
@@ -15,3 +15,14 @@ metadata:
spec:
image: ghcr.io/matrix-org/sliding-sync
interval: 15m
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: GitRepository
+metadata:
+ name: matrix-gateway-api
+ namespace: matrix
+spec:
+ interval: 1h
+ url: https://gitlab.com/MTRNord/ananace-personal-charts.git
+ ref:
+ branch: MTRNord/gateway-api
diff --git a/apps/base/matrix/synapse/release.yaml b/apps/base/matrix/synapse/release.yaml
@@ -4,13 +4,20 @@ metadata:
name: matrix-synapse
namespace: matrix
spec:
+ # chart:
+ # spec:
+ # chart: matrix-synapse
+ # sourceRef:
+ # kind: HelmRepository
+ # name: ananace-charts
+ # version: 3.11.x
chart:
spec:
- chart: matrix-synapse
+ chart: ./charts/matrix-synapse/
sourceRef:
- kind: HelmRepository
- name: ananace-charts
- version: 3.11.x
+ kind: GitRepository
+ name: matrix-gateway-api
+ namespace: matrix
interval: 50m
install:
remediation:
diff --git a/apps/base/victoria-metrics-k8s-stack/release.yaml b/apps/base/victoria-metrics-k8s-stack/release.yaml
@@ -197,7 +197,8 @@ spec:
execErrState: Error
for: 5m
annotations:
- description: Depending on the rate limit, cert-manager may be unable to generate certificates for up to a week.
+ description: Depending on the rate limit, cert-manager may be unable to generate certificates
+ for up to a week.
summary: Cert manager hitting LetsEncrypt rate limits.
labels: {}
isPaused: false
@@ -1399,7 +1400,8 @@ spec:
auth_url: https://auth.midnightthoughts.space/application/o/authorize/
token_url: https://auth.midnightthoughts.space/application/o/token/
api_url: https://auth.midnightthoughts.space/application/o/userinfo/
- role_attribute_path: contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'
+ role_attribute_path: contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors')
+ && 'Editor' || 'Viewer'
imageRenderer:
enabled: true
kubeProxy: