add whatsapp

2025-12-13 12:37:36 -06:00
parent 6f76a7e634
commit 84950544cd
5 changed files with 123 additions and 103 deletions
--- a/clusters/cl01tl/helm/matrix-synapse/Chart.lock
+++ b/clusters/cl01tl/helm/matrix-synapse/Chart.lock
@@ -5,6 +5,9 @@ dependencies:
 - name: app-template
  repository: https://bjw-s-labs.github.io/helm-charts/
  version: 4.5.0
+- name: app-template
+  repository: https://bjw-s-labs.github.io/helm-charts/
+  version: 4.5.0
 - name: cloudflared
  repository: oci://harbor.alexlebens.net/helm-charts
  version: 1.23.2
@@ -14,5 +17,5 @@ dependencies:
 - name: postgres-cluster
  repository: oci://harbor.alexlebens.net/helm-charts
  version: 6.16.1
-digest: sha256:03adeb2c6a2fc286701a105e1ed77f03b1cbd87098d80f8a9daa63bad9d311bf
-generated: "2025-12-12T20:29:06.640579-06:00"
+digest: sha256:39947be082bd5217be527bb9a603f5026e877e988100165bb76970e5192b7e56
+generated: "2025-12-13T12:37:23.30846-06:00"
--- a/clusters/cl01tl/helm/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/Chart.yaml
@@ -38,11 +38,11 @@ dependencies:
  # - name: app-template
  #   alias: mautrix-discord
  #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 4.0.1
-  # - name: app-template
-  #   alias: mautrix-whatsapp
-  #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 4.0.1
+  #   version: 4.5.0
+  - name: app-template
+    alias: mautrix-whatsapp
+    repository: https://bjw-s-labs.github.io/helm-charts/
+    version: 4.5.0
  - name: cloudflared
    alias: cloudflared-synapse
    version: 1.23.2
--- a/clusters/cl01tl/helm/matrix-synapse/templates/database.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/templates/database.yaml
@@ -0,0 +1,14 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  cluster:
+    name: matrix-synapse-postgresql-18-cluster
+  name: mautrix-whatsapp
+  owner: app
--- a/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml
@@ -123,34 +123,35 @@ spec:
 #         metadataPolicy: None
 #         property: registration

-# ---
-# apiVersion: external-secrets.io/v1
-# kind: ExternalSecret
-# metadata:
-#   name: mautrix-whatsapp-config-secret
-#   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
-# spec:
-#   secretStoreRef:
-#     kind: ClusterSecretStore
-#     name: vault
-#   data:
-#     - secretKey: config.yaml
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /cl01tl/matrix-synapse/mautrix-whatsapp
-#         metadataPolicy: None
-#         property: config
-#     - secretKey: mautrix-whatsapp-registration.yaml
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /cl01tl/matrix-synapse/mautrix-whatsapp
-#         metadataPolicy: None
-#         property: registration
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: mautrix-whatsapp-config-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: mautrix-whatsapp-config-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: config.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/matrix-synapse/mautrix-whatsapp
+        metadataPolicy: None
+        property: config
+    - secretKey: mautrix-whatsapp-registration.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/matrix-synapse/mautrix-whatsapp
+        metadataPolicy: None
+        property: registration

 ---
 apiVersion: external-secrets.io/v1
@@ -357,61 +358,61 @@ spec:
 #         metadataPolicy: None
 #         property: secret_key

-# ---
-# apiVersion: external-secrets.io/v1
-# kind: ExternalSecret
-# metadata:
-#   name: mautrix-whatsapp-data-backup-secret
-#   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
-# spec:
-#   secretStoreRef:
-#     kind: ClusterSecretStore
-#     name: vault
-#   target:
-#     template:
-#       mergePolicy: Merge
-#       engineVersion: v2
-#       data:
-#         RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/matrix-synapse/mautrix-whatsapp-data"
-#   data:
-#     - secretKey: BUCKET_ENDPOINT
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /cl01tl/volsync/restic/config
-#         metadataPolicy: None
-#         property: S3_BUCKET_ENDPOINT
-#     - secretKey: RESTIC_PASSWORD
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /cl01tl/volsync/restic/config
-#         metadataPolicy: None
-#         property: RESTIC_PASSWORD
-#     - secretKey: AWS_DEFAULT_REGION
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /cl01tl/volsync/restic/config
-#         metadataPolicy: None
-#         property: AWS_DEFAULT_REGION
-#     - secretKey: AWS_ACCESS_KEY_ID
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /digital-ocean/home-infra/volsync-backups
-#         metadataPolicy: None
-#         property: access_key
-#     - secretKey: AWS_SECRET_ACCESS_KEY
-#       remoteRef:
-#         conversionStrategy: Default
-#         decodingStrategy: None
-#         key: /digital-ocean/home-infra/volsync-backups
-#         metadataPolicy: None
-#         property: secret_key
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: mautrix-whatsapp-data-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/matrix-synapse/mautrix-whatsapp-data"
+  data:
+    - secretKey: BUCKET_ENDPOINT
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: S3_BUCKET_ENDPOINT
+    - secretKey: RESTIC_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: RESTIC_PASSWORD
+    - secretKey: AWS_DEFAULT_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/volsync/restic/config
+        metadataPolicy: None
+        property: AWS_DEFAULT_REGION
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: access_key
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/volsync-backups
+        metadataPolicy: None
+        property: secret_key

 ---
 apiVersion: external-secrets.io/v1
--- a/clusters/cl01tl/helm/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/values.yaml
@@ -28,6 +28,7 @@ matrix-synapse:
    app_service_config_files:
      - /synapse/config/conf.d/hookshot-registration.yaml
      - /synapse/config/conf.d/double-puppet-registration.yaml
+      - /synapse/config/conf.d/mautrix-whatsapp-registration.yaml
  synapse:
    strategy:
      type: Recreate
@@ -41,9 +42,9 @@ matrix-synapse:
      # - name: mautrix-discord-config-secret
      #   secret:
      #     secretName: mautrix-discord-config-secret
-      # - name: mautrix-whatsapp-config-secret
-      #   secret:
-      #     secretName: mautrix-whatsapp-config-secret
+      - name: mautrix-whatsapp-config-secret
+        secret:
+          secretName: mautrix-whatsapp-config-secret
      - name: double-puppet-registration-secret
        secret:
          secretName: double-puppet-registration-secret
@@ -64,10 +65,10 @@ matrix-synapse:
      #   mountPath: /synapse/config/conf.d/mautrix-discord-registration.yaml
      #   subPath: mautrix-discord-registration.yaml
      #   readOnly: true
-      # - name: mautrix-whatsapp-config-secret
-      #   mountPath: /synapse/config/conf.d/mautrix-whatsapp-registration.yaml
-      #   subPath: mautrix-whatsapp-registration.yaml
-      #   readOnly: true
+      - name: mautrix-whatsapp-config-secret
+        mountPath: /synapse/config/conf.d/mautrix-whatsapp-registration.yaml
+        subPath: mautrix-whatsapp-registration.yaml
+        readOnly: true
      - name: double-puppet-registration-secret
        mountPath: /synapse/config/conf.d/double-puppet-registration.yaml
        subPath: double-puppet-registration.yaml
@@ -216,9 +217,9 @@ mautrix-discord:
    fullnameOverride: mautrix-discord
  controllers:
    main:
-      type: deployment
+      type: statefulset
      replicas: 1
-      strategy: Recreate
+      strategy: RollingUpdate
      revisionHistoryLimit: 3
      containers:
        main:
@@ -262,12 +263,13 @@ mautrix-discord:
              subPath: config.yaml
 mautrix-whatsapp:
  global:
+    nameOverride: mautrix-whatsapp
    fullnameOverride: mautrix-whatsapp
  controllers:
    main:
-      type: deployment
+      type: statefulset
      replicas: 1
-      strategy: Recreate
+      strategy: RollingUpdate
      revisionHistoryLimit: 3
      containers:
        main:
@@ -284,8 +286,8 @@ mautrix-whatsapp:
      controller: main
      ports:
        http:
-          port: 29333
-          targetPort: 29333
+          port: 29318
+          targetPort: 29318
          protocol: HTTP
  persistence:
    data: