convert to use app-template

clusters/cl01tl/platform/matrix-synapse/Chart.yaml

@@ -1,26 +1,41 @@
 apiVersion: v2
 name: matrix-synapse
 version: 1.0.0
+description: Matrix Synapse
+keywords:
+  - chat
+  - bridge
+  - matrix
+  - matrix-hookshot
+  - mautrix-discord
+  - mautrix-whatsapp
 sources:
   - https://github.com/element-hq/synapse
   - https://github.com/matrix-org/matrix-hookshot
   - https://github.com/mautrix/discord
   - https://github.com/mautrix/whatsapp
+  - https://github.com/cloudflare/cloudflared
   - https://gitlab.com/ananace/charts/-/tree/master/charts/matrix-synapse
   - https://github.com/alexlebens/helm-charts/charts/postgres-cluster
+  - https://github.com/bjw-s/helm-charts/tree/main/charts/other/app-template
+maintainers:
+  - name: alexlebens
 dependencies:
   - name: matrix-synapse
     version: 3.9.5
     repository: https://ananace.gitlab.io/charts
-  - name: matrix-hookshot
+  - name: app-template
-    version: 0.1.1
+    alias: matrix-hookshot
-    repository: http://alexlebens.github.io/helm-charts
+    repository: https://bjw-s.github.io/helm-charts/
-  - name: mautrix-discord
+    version: 3.2.1
-    version: 0.1.1
+  - name: app-template
-    repository: http://alexlebens.github.io/helm-charts
+    alias: mautrix-discord
-  - name: mautrix-whatsapp
+    repository: https://bjw-s.github.io/helm-charts/
-    version: 0.1.1
+    version: 3.2.1
-    repository: http://alexlebens.github.io/helm-charts       
+  - name: app-template
+    alias: mautrix-whatsapp
+    repository: https://bjw-s.github.io/helm-charts/
+    version: 3.2.1
   - name: redis
     version: 19.5.0
     repository: https://charts.bitnami.com/bitnami
@@ -31,7 +46,7 @@ dependencies:
   - name: cloudflared
     alias: cloudflared-hookshot
     repository: http://alexlebens.github.io/helm-charts
-    version: 1.2.0    
+    version: 1.2.0
   - name: postgres-cluster
     alias: postgres-16-cluster
     version: 3.1.0

clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml

@@ -19,3 +19,26 @@ spec:
     matchLabels:
       app.kubernetes.io/name: matrix-synapse
       app.kubernetes.io/instance: {{ .Release.Name }}
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: matrix-hookshot
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: matrix-hookshot
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  endpoints:
+    - port: metrics
+      interval: 15s
+      scrapeTimeout: 5s
+      path: /metrics
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: matrix-hookshot
+      app.kubernetes.io/instance: {{ .Release.Name }}

clusters/cl01tl/platform/matrix-synapse/values.yaml

@@ -33,7 +33,7 @@ matrix-synapse:
           secretName: mautrix-discord-config-secret
       - name: mautrix-whatsapp-config-secret
         secret:
-          secretName: mautrix-whatsapp-config-secret          
+          secretName: mautrix-whatsapp-config-secret
     extraVolumeMounts:
       - name: matrix-synapse-config-secret
         mountPath: /synapse/config/conf.d/oidc.yaml
@@ -54,7 +54,7 @@ matrix-synapse:
       - name: mautrix-whatsapp-config-secret
         mountPath: /synapse/config/conf.d/mautrix-whatsapp-registration.yaml
         subPath: mautrix-whatsapp-registration.yaml
-        readOnly: true        
+        readOnly: true
     resources:
       requests:
         cpu: 100m
@@ -109,52 +109,176 @@ matrix-synapse:
   ingress:
     enabled: false
 matrix-hookshot:
-  deployment:
+  controllers:
-    resources:
+    main:
-      requests:
+      type: deployment
-        cpu: 100m
+      replicas: 1
-        memory: 128Mi
+      strategy: Recreate
-  ingress:
+      revisionHistoryLimit: 3
-    webhook:
+      containers:
-      enabled: false
+        main:
-    appservice:
+          image:
-      enabled: false
+            repository: halfshot/matrix-hookshot
-  metrics:
+            tag: 5.3.0
-    enabled: true
+            pullPolicy: IfNotPresent
-    serviceMonitor:
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+  serviceAccount:
+    create: true
+  service:
+    main:
+      controller: main
+      ports:
+        webhook:
+          port: 9000
+          targetPort: 9000
+          protocol: HTTP
+        metrics:
+          port: 9001
+          targetPort: 9001
+          protocol: HTTP
+        appservice:
+          port: 9002
+          targetPort: 9002
+          protocol: HTTP
+        widgets:
+          port: 9003
+          targetPort: 9003
+          protocol: HTTP
+  persistence:
+    config:
       enabled: true
-  hookshot:
+      type: secret
-    existingSecret: matrix-hookshot-config-secret
+      name: matrix-hookshot-config-secret
-    existingRegistrationSecret: matrix-hookshot-config-secret
+      advancedMounts:
-    existingPasskeySecret: matrix-hookshot-config-secret
+        main:
+          main:
+            - path: /data/config.yml
+              readOnly: true
+              mountPropagation: None
+              subPath: config.yml
+    registration:
+      enabled: true
+      type: secret
+      name: matrix-hookshot-config-secret
+      advancedMounts:
+        main:
+          main:
+            - path: /data/registration.yml
+              readOnly: true
+              mountPropagation: None
+              subPath: registration.yml
+    passkey:
+      enabled: true
+      type: secret
+      name: matrix-hookshot-config-secret
+      advancedMounts:
+        main:
+          main:
+            - path: /data/passkey.pem
+              readOnly: true
+              mountPropagation: None
+              subPath: passkey.pem
 mautrix-discord:
-  deployment:
+  controllers:
-    resources:
+    main:
-      requests:
+      type: deployment
-        cpu: 100m
+      replicas: 1
-        memory: 128Mi
+      strategy: Recreate
-  ingress:
+      revisionHistoryLimit: 3
-    enabled: false
+      containers:
+        main:
+          image:
+            repository: dock.mau.dev/mautrix/discord
+            tag: v0.6.5
+            pullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+  serviceAccount:
+    create: true
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 29334
+          targetPort: 29334
+          protocol: HTTP
   persistence:
-    enabled: ture
+    data:
-    storageClass: ceph-block
+      storageClass: ceph-block
-    size: 500Mi
+      accessMode: ReadWriteOnce
-  mautrixDiscord:
+      size: 500Mi
-    existingSecret: mautrix-discord-config-secret
+      retain: true
+      advancedMounts:
+        main:
+          main:
+            - path: /data
+              readOnly: false
+    config:
+      enabled: true
+      type: secret
+      name: mautrix-discord-config-secret
+      advancedMounts:
+        main:
+          main:
+            - path: /data/config.yml
+              readOnly: true
+              mountPropagation: None
+              subPath: config.yml
 mautrix-whatsapp:
-  deployment:
+  controllers:
-    resources:
+    main:
-      requests:
+      type: deployment
-        cpu: 100m
+      replicas: 1
-        memory: 128Mi
+      strategy: Recreate
-  ingress:
+      revisionHistoryLimit: 3
-    enabled: false
+      containers:
+        main:
+          image:
+            repository: dock.mau.dev/mautrix/whatsapp
+            tag: v0.10.7
+            pullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+  serviceAccount:
+    create: true
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 29334
+          targetPort: 29334
+          protocol: HTTP
   persistence:
-    enabled: ture
+    data:
-    storageClass: ceph-block
+      storageClass: ceph-block
-    size: 500Mi
+      accessMode: ReadWriteOnce
-  mautrixWhatsapp:
+      size: 500Mi
-    existingSecret: mautrix-whatsapp-config-secret    
+      retain: true
+      advancedMounts:
+        main:
+          main:
+            - path: /data
+              readOnly: false
+    config:
+      enabled: true
+      type: secret
+      name: mautrix-whatsapp-config-secret
+      advancedMounts:
+        main:
+          main:
+            - path: /data/config.yml
+              readOnly: true
+              mountPropagation: None
+              subPath: config.yml
 redis:
   architecture: standalone
   auth:
@@ -167,6 +291,12 @@ redis:
   replica:
     persistence:
       enabled: false
+cloudflared-synapse:
+  name: cloudflared-synapse
+  existingSecretName: matrix-synapse-cloudflared-synapse-secret
+cloudflared-hookshot:
+  name: cloudflared-hookshot
+  existingSecretName: matrix-synapse-cloudflared-hookshot-secret
 postgres-16-cluster:
   mode: standalone
   cluster:
@@ -185,9 +315,3 @@ postgres-16-cluster:
     endpointCredentials: matrix-synapse-postgresql-16-cluster-backup-secret
     backupIndex: 1
     retentionPolicy: 14d
-cloudflared-synapse:
-  name: cloudflared-synapse
-  existingSecretName: matrix-synapse-cloudflared-synapse-secret
-cloudflared-hookshot:
-  name: cloudflared-hookshot
-  existingSecretName: matrix-synapse-cloudflared-hookshot-secret