From 0a0f485efefc40800a412feb06104fddb4b36a1f Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Tue, 24 Dec 2024 06:48:43 +0000 Subject: [PATCH] Revert "Revert "Removed matrix bridges"" This reverts commit 36b88cf20334e6c5380dee617b67997eeea716d2. --- manifests/matrix_chart/matrix_chart.yaml | 18 --- manifests/matrix_chart/signal_bridge.yaml | 153 -------------------- manifests/matrix_chart/telegram_bridge.yaml | 143 ------------------ manifests/matrix_chart/whatsapp_bridge.yaml | 143 ------------------ 4 files changed, 457 deletions(-) delete mode 100644 manifests/matrix_chart/signal_bridge.yaml delete mode 100644 manifests/matrix_chart/telegram_bridge.yaml delete mode 100644 manifests/matrix_chart/whatsapp_bridge.yaml diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml index a66647d..c2d4687 100644 --- a/manifests/matrix_chart/matrix_chart.yaml +++ b/manifests/matrix_chart/matrix_chart.yaml @@ -480,15 +480,6 @@ spec: - name: synapse-config-homeserver mountPath: /data/homeserver.yaml subPath: homeserver.yaml - - name: mautrix-whatsapp-registration - mountPath: /data/mautrix-whatsapp-registration.yaml - subPath: registration.yaml - # - name: mautrix-signal-registration - # mountPath: /data/mautrix-signal-registration.yaml - # subPath: registration.yaml - # - name: mautrix-telegram-registration - # mountPath: /data/mautrix-telegram-registration.yaml - # subPath: registration.yaml - name: synapse-config-logging mountPath: /data/matrix.cluster.fun.log.config subPath: matrix.cluster.fun.log.config @@ -532,15 +523,6 @@ spec: - name: synapse-config-homeserver secret: secretName: matrix-synapse-config - - name: mautrix-whatsapp-registration - secret: - secretName: mautrix-whatsapp-registration - # - name: mautrix-signal-registration - # secret: - # secretName: mautrix-signal-registration - # - name: mautrix-telegram-registration - # secret: - # secretName: mautrix-telegram-registration - name: signing-key persistentVolumeClaim: claimName: chat-matrix-signing-key diff --git a/manifests/matrix_chart/signal_bridge.yaml b/manifests/matrix_chart/signal_bridge.yaml deleted file mode 100644 index 0fa61be..0000000 --- a/manifests/matrix_chart/signal_bridge.yaml +++ /dev/null @@ -1,153 +0,0 @@ -# apiVersion: v1 -# kind: Secret -# metadata: -# name: mautrix-signal-registration -# namespace: chat -# annotations: -# kube-1password: z6tylu2br724gttcpfyi5egaui -# kube-1password/vault: Kubernetes -# kube-1password/secret-text-key: registration.yaml -# labels: -# app.kubernetes.io/name: "mautrix-signal" -# component: registration -# type: Opaque - -# --- - -# apiVersion: v1 -# kind: Secret -# metadata: -# name: mautrix-signal-config -# namespace: chat -# annotations: -# kube-1password: 5vfaorcudozlq4clkzgmzzszqe -# kube-1password/vault: Kubernetes -# kube-1password/secret-text-key: config.yaml -# labels: -# app.kubernetes.io/name: "mautrix-signal" -# component: config -# type: Opaque - -# --- - -# apiVersion: v1 -# kind: Service -# metadata: -# name: mautrix-signal -# namespace: chat -# labels: -# app.kubernetes.io/name: mautrix-signal -# annotations: -# prometheus.io/scrape: "true" -# prometheus.io/path: "/metrics" -# prometheus.io/port: "9000" -# spec: -# type: ClusterIP -# ports: -# - port: 29328 -# targetPort: http -# protocol: TCP -# name: http -# selector: -# app.kubernetes.io/name: mautrix-signal - -# --- - -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: mautrix-signal -# labels: -# app.kubernetes.io/name: mautrix-signal -# spec: -# revisionHistoryLimit: 3 -# replicas: 1 -# strategy: -# type: Recreate -# selector: -# matchLabels: -# app.kubernetes.io/name: mautrix-signal -# template: -# metadata: -# labels: -# app.kubernetes.io/name: mautrix-signal -# spec: -# serviceAccountName: default -# automountServiceAccountToken: true -# dnsPolicy: ClusterFirst -# enableServiceLinks: true -# initContainers: -# - name: config-copy -# image: bash:latest -# imagePullPolicy: IfNotPresent -# args: -# - -c -# - | -# cp /secrets/* /data/ -# volumeMounts: -# - name: mautrix-signal-config -# mountPath: /secrets/config.yaml -# subPath: config.yaml -# - name: mautrix-signal-registration -# mountPath: /secrets/registration.yaml -# subPath: registration.yaml -# - name: data -# mountPath: /data -# containers: -# - name: signald -# image: docker.io/signald/signald:stable -# imagePullPolicy: Always -# volumeMounts: -# - name: signald -# mountPath: /signald -# - name: mautrix-signal -# image: "dock.mau.dev/mautrix/signal:v0.4.3" -# imagePullPolicy: IfNotPresent -# env: -# - name: "TZ" -# value: "UTC" -# ports: -# - name: http -# containerPort: 29328 -# protocol: TCP -# - name: metrics -# containerPort: 9000 -# protocol: TCP -# volumeMounts: -# - name: signald -# mountPath: /signald -# - name: data -# mountPath: /data -# livenessProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 3 -# timeoutSeconds: 1 -# periodSeconds: 10 -# readinessProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 3 -# timeoutSeconds: 1 -# periodSeconds: 10 -# startupProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 30 -# timeoutSeconds: 1 -# periodSeconds: 5 -# volumes: -# - name: data -# emptyDir: {} -# - name: signald -# emptyDir: {} -# - name: mautrix-signal-config -# secret: -# secretName: mautrix-signal-config -# - name: mautrix-signal-registration -# secret: -# secretName: mautrix-signal-registration -# --- diff --git a/manifests/matrix_chart/telegram_bridge.yaml b/manifests/matrix_chart/telegram_bridge.yaml deleted file mode 100644 index efd829e..0000000 --- a/manifests/matrix_chart/telegram_bridge.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# apiVersion: v1 -# kind: Secret -# metadata: -# name: mautrix-telegram-registration -# namespace: chat -# annotations: -# kube-1password: dancy7ogc4gjlxhfntqejgudwi -# kube-1password/vault: Kubernetes -# kube-1password/secret-text-key: registration.yaml -# labels: -# app.kubernetes.io/name: "mautrix-telegram" -# component: registration -# type: Opaque - -# --- - -# apiVersion: v1 -# kind: Secret -# metadata: -# name: mautrix-telegram-config -# namespace: chat -# annotations: -# kube-1password: nilzdpfum35hhwijnwvasbzmcq -# kube-1password/vault: Kubernetes -# kube-1password/secret-text-key: config.yaml -# labels: -# app.kubernetes.io/name: "mautrix-telegram" -# component: config -# type: Opaque - -# --- - -# apiVersion: v1 -# kind: Service -# metadata: -# name: mautrix-telegram -# namespace: chat -# labels: -# app.kubernetes.io/name: mautrix-telegram -# annotations: -# prometheus.io/scrape: "true" -# prometheus.io/path: "/metrics" -# prometheus.io/port: "9000" -# spec: -# type: ClusterIP -# ports: -# - port: 29318 -# targetPort: http -# protocol: TCP -# name: http -# selector: -# app.kubernetes.io/name: mautrix-telegram - -# --- - -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: mautrix-telegram -# labels: -# app.kubernetes.io/name: mautrix-telegram -# spec: -# revisionHistoryLimit: 3 -# replicas: 1 -# strategy: -# type: Recreate -# selector: -# matchLabels: -# app.kubernetes.io/name: mautrix-telegram -# template: -# metadata: -# labels: -# app.kubernetes.io/name: mautrix-telegram -# spec: -# serviceAccountName: default -# automountServiceAccountToken: true -# dnsPolicy: ClusterFirst -# enableServiceLinks: true -# initContainers: -# - name: config-copy -# image: bash:latest -# imagePullPolicy: IfNotPresent -# args: -# - -c -# - | -# cp /secrets/* /data/ -# volumeMounts: -# - name: mautrix-telegram-config -# mountPath: /secrets/config.yaml -# subPath: config.yaml -# - name: mautrix-telegram-registration -# mountPath: /secrets/registration.yaml -# subPath: registration.yaml -# - name: data -# mountPath: /data -# containers: -# - name: mautrix-telegram -# image: "dock.mau.dev/mautrix/telegram:v0.12.1" -# imagePullPolicy: IfNotPresent -# env: -# - name: "TZ" -# value: "UTC" -# ports: -# - name: http -# containerPort: 29318 -# protocol: TCP -# - name: metrics -# containerPort: 9000 -# protocol: TCP -# volumeMounts: -# - name: data -# mountPath: /data -# livenessProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 3 -# timeoutSeconds: 1 -# periodSeconds: 10 -# readinessProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 3 -# timeoutSeconds: 1 -# periodSeconds: 10 -# startupProbe: -# tcpSocket: -# port: 29318 -# initialDelaySeconds: 0 -# failureThreshold: 30 -# timeoutSeconds: 1 -# periodSeconds: 5 -# volumes: -# - name: data -# emptyDir: {} -# - name: mautrix-telegram-config -# secret: -# secretName: mautrix-telegram-config -# - name: mautrix-telegram-registration -# secret: -# secretName: mautrix-telegram-registration -# --- diff --git a/manifests/matrix_chart/whatsapp_bridge.yaml b/manifests/matrix_chart/whatsapp_bridge.yaml deleted file mode 100644 index b4e0ee7..0000000 --- a/manifests/matrix_chart/whatsapp_bridge.yaml +++ /dev/null @@ -1,143 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: mautrix-whatsapp-registration - namespace: chat - annotations: - kube-1password: x6lzkpyov4dem5jtk2kimyrnvy - kube-1password/vault: Kubernetes - kube-1password/secret-text-key: registration.yaml - labels: - app.kubernetes.io/name: "mautrix-whatsapp" - component: registration -type: Opaque - ---- - -apiVersion: v1 -kind: Secret -metadata: - name: mautrix-whatsapp-config - namespace: chat - annotations: - kube-1password: ji3e2el66bu56bml3kq3ghyojq - kube-1password/vault: Kubernetes - kube-1password/secret-text-key: config.yaml - labels: - app.kubernetes.io/name: "mautrix-whatsapp" - component: config -type: Opaque - ---- - -apiVersion: v1 -kind: Service -metadata: - name: mautrix-whatsapp - namespace: chat - labels: - app.kubernetes.io/name: mautrix-whatsapp - # annotations: - # prometheus.io/scrape: "true" - # prometheus.io/path: "/metrics" - # prometheus.io/port: "9000" -spec: - type: ClusterIP - ports: - - port: 29318 - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: mautrix-whatsapp - ---- - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mautrix-whatsapp - labels: - app.kubernetes.io/name: mautrix-whatsapp -spec: - revisionHistoryLimit: 3 - replicas: 1 - strategy: - type: Recreate - selector: - matchLabels: - app.kubernetes.io/name: mautrix-whatsapp - template: - metadata: - labels: - app.kubernetes.io/name: mautrix-whatsapp - spec: - serviceAccountName: default - automountServiceAccountToken: true - dnsPolicy: ClusterFirst - enableServiceLinks: true - initContainers: - - name: config-copy - image: bash:latest - imagePullPolicy: IfNotPresent - args: - - -c - - | - cp /secrets/* /data/ - volumeMounts: - - name: mautrix-whatsapp-config - mountPath: /secrets/config.yaml - subPath: config.yaml - - name: mautrix-whatsapp-registration - mountPath: /secrets/registration.yaml - subPath: registration.yaml - - name: data - mountPath: /data - containers: - - name: mautrix-whatsapp - image: "dock.mau.dev/mautrix/whatsapp:v0.11.0" - imagePullPolicy: IfNotPresent - env: - - name: "TZ" - value: "UTC" - ports: - - name: http - containerPort: 29318 - protocol: TCP - # - name: metrics - # containerPort: 9000 - # protocol: TCP - volumeMounts: - - name: data - mountPath: /data - livenessProbe: - tcpSocket: - port: 29318 - initialDelaySeconds: 0 - failureThreshold: 3 - timeoutSeconds: 1 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 29318 - initialDelaySeconds: 0 - failureThreshold: 3 - timeoutSeconds: 1 - periodSeconds: 10 - startupProbe: - tcpSocket: - port: 29318 - initialDelaySeconds: 0 - failureThreshold: 30 - timeoutSeconds: 1 - periodSeconds: 5 - volumes: - - name: data - emptyDir: {} - - name: mautrix-whatsapp-config - secret: - secretName: mautrix-whatsapp-config - - name: mautrix-whatsapp-registration - secret: - secretName: mautrix-whatsapp-registration ----