From f7e2b540f6b088549271f82cb8d4da35767d0efd Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Mon, 20 Nov 2023 15:12:33 +0000 Subject: [PATCH] Re-add signal bridge Signed-off-by: Marcus Noble --- manifests/matrix_chart/matrix_chart.yaml | 12 +- manifests/matrix_chart/signal_bridge.yaml | 294 +++++++++++----------- 2 files changed, 153 insertions(+), 153 deletions(-) diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml index e33a664..b054e71 100644 --- a/manifests/matrix_chart/matrix_chart.yaml +++ b/manifests/matrix_chart/matrix_chart.yaml @@ -474,9 +474,9 @@ spec: - 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-signal-registration + mountPath: /data/mautrix-signal-registration.yaml + subPath: registration.yaml # - name: mautrix-telegram-registration # mountPath: /data/mautrix-telegram-registration.yaml # subPath: registration.yaml @@ -526,9 +526,9 @@ spec: - name: mautrix-whatsapp-registration secret: secretName: mautrix-whatsapp-registration - # - name: mautrix-signal-registration - # secret: - # secretName: mautrix-signal-registration + - name: mautrix-signal-registration + secret: + secretName: mautrix-signal-registration # - name: mautrix-telegram-registration # secret: # secretName: mautrix-telegram-registration diff --git a/manifests/matrix_chart/signal_bridge.yaml b/manifests/matrix_chart/signal_bridge.yaml index c1aa7fc..083e57c 100644 --- a/manifests/matrix_chart/signal_bridge.yaml +++ b/manifests/matrix_chart/signal_bridge.yaml @@ -1,153 +1,153 @@ -# 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-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: 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: 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.1" -# 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 -# --- +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 +---