matrix: adjust for cluster changes, fix evaluation
Change-Id: I11eae24a073df4f2893a2a371c4c142dd1017d50
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1826
Reviewed-by: radex <radex@hackerspace.pl>
diff --git a/app/matrix/lib/appservice/appservice-telegram.yaml b/app/matrix/lib/appservice/appservice-telegram.yaml
index 28880af..1a6da7d 100644
--- a/app/matrix/lib/appservice/appservice-telegram.yaml
+++ b/app/matrix/lib/appservice/appservice-telegram.yaml
@@ -75,7 +75,7 @@
# Prometheus telemetry config. Requires prometheus-client to be installed.
metrics:
- enabled: false
+ enabled: true
listen_port: 8000
# Manhole config.
diff --git a/app/matrix/lib/matrix-ng.libsonnet b/app/matrix/lib/matrix-ng.libsonnet
index c862015..153e4f7 100644
--- a/app/matrix/lib/matrix-ng.libsonnet
+++ b/app/matrix/lib/matrix-ng.libsonnet
@@ -113,7 +113,7 @@
riot: "vectorim/element-web:v1.11.26",
casProxy: "registry.k0.hswaw.net/q3k/oauth2-cas-proxy:0.1.4",
appserviceIRC: "matrixdotorg/matrix-appservice-irc:release-0.35.1",
- appserviceTelegram: "dock.mau.dev/tulir/mautrix-telegram@sha256:c6e25cb57e1b67027069e8dc2627338df35d156315c004a6f2b34b6aeaa79f77",
+ appserviceTelegram: "dock.mau.dev/mautrix/telegram@sha256:5709a05cd10c3f3e8d7cbb8378db685406f05ba6f133a63807929605b560c1f8",
wellKnown: "registry.k0.hswaw.net/q3k/wellknown:1611960794-adbf560851a46ad0e58b42f0daad7ef19535687c",
mediaRepo: "turt2live/matrix-media-repo:v1.2.12",
coturn: "coturn/coturn:4.5.2-r11-alpine",
@@ -360,7 +360,7 @@
// until it spits you a registration YAML and you feed that to a secret.
appservices: {},
- ingress: top.namespace.Contain(kube.Ingress("matrix")) {
+ ingress: ns.Contain(kube.Ingress("matrix")) {
metadata+: {
annotations+: {
"kubernetes.io/tls-acme": "true",