chore: Update manifests after change

clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-alertmanager.yaml

@@ -1,12 +1,17 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-alertmanager
+  name: kube-prometheus-stack-alertmanager
   namespace: kube-prometheus-stack
   labels:
-    app.kubernetes.io/name: http-route-alertmanager
+    app: kube-prometheus-stack-alertmanager
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: kube-prometheus-stack
+    app.kubernetes.io/version: "80.6.0"
     app.kubernetes.io/part-of: kube-prometheus-stack
+    chart: kube-prometheus-stack-80.6.0
+    release: "kube-prometheus-stack"
+    heritage: "Helm"
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -16,13 +21,10 @@ spec:
   hostnames:
     - alertmanager.alexlebens.net
   rules:
-    - matches:
+    - backendRefs:
+        - name: kube-prometheus-stack-alertmanager
+          port: 9093
+      matches:
         - path:
             type: PathPrefix
             value: /
-      backendRefs:
-        - group: ''
-          kind: Service
-          name: kube-prometheus-stack-alertmanager
-          port: 9093
-          weight: 100

clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-prometheus.yaml

@@ -1,12 +1,17 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-prometheus
+  name: kube-prometheus-stack-prometheus
   namespace: kube-prometheus-stack
   labels:
-    app.kubernetes.io/name: http-route-prometheus
+    app: kube-prometheus-stack-prometheus
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: kube-prometheus-stack
+    app.kubernetes.io/version: "80.6.0"
     app.kubernetes.io/part-of: kube-prometheus-stack
+    chart: kube-prometheus-stack-80.6.0
+    release: "kube-prometheus-stack"
+    heritage: "Helm"
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -14,15 +19,12 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - prometheus.alexlebens.net
+    - alertmanager.alexlebens.net
   rules:
-    - matches:
+    - backendRefs:
+        - name: kube-prometheus-stack-prometheus
+          port: 9090
+      matches:
         - path:
             type: PathPrefix
             value: /
-      backendRefs:
-        - group: ''
-          kind: Service
-          name: prometheus-operated
-          port: 9090
-          weight: 100

clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: lidarr-postgresql-18-cluster
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3

clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-backup-garage-local-secret.yaml

@@ -0,0 +1,39 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: lidarr-postgresql-18-backup-garage-local-secret
+  namespace: lidarr
+  labels:
+    helm.sh/chart: postgres-18-cluster-7.4.3
+    app.kubernetes.io/name: lidarr-postgresql-18
+    app.kubernetes.io/instance: lidarr
+    app.kubernetes.io/part-of: lidarr
+    app.kubernetes.io/version: "7.4.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidarr-postgresql-18-backup-garage-local-secret
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_REGION
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_KEY_ID
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret.yaml

@@ -1,28 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: lidarr-postgresql-18-cluster-backup-secret
-  namespace: lidarr
-  labels:
-    app.kubernetes.io/name: lidarr-postgresql-18-cluster-backup-secret
-    app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: ACCESS_KEY_ID
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /digital-ocean/home-infra/postgres-backups
-        metadataPolicy: None
-        property: access
-    - secretKey: ACCESS_SECRET_KEY
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /digital-ocean/home-infra/postgres-backups
-        metadataPolicy: None
-        property: secret

clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-recovery-secret.yaml

@@ -1,17 +1,28 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: lidarr-postgresql-18-cluster-backup-secret-garage
+  name: lidarr-postgresql-18-recovery-secret
   namespace: lidarr
   labels:
-    app.kubernetes.io/name: lidarr-postgresql-18-cluster-backup-secret-garage
+    helm.sh/chart: postgres-18-cluster-7.4.3
+    app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
+    app.kubernetes.io/version: "7.4.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidarr-postgresql-18-recovery-secret
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: vault
   data:
+    - secretKey: ACCESS_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_REGION
     - secretKey: ACCESS_KEY_ID
       remoteRef:
         conversionStrategy: Default
@@ -26,10 +37,3 @@ spec:
         key: /garage/home-infra/postgres-backups
         metadataPolicy: None
         property: ACCESS_SECRET_KEY
-    - secretKey: ACCESS_REGION
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/postgres-backups
-        metadataPolicy: None
-        property: ACCESS_REGION

clusters/cl01tl/manifests/lidarr/HTTPRoute-lidarr.yaml

@@ -1,12 +1,13 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-lidarr
+  name: lidarr
-  namespace: lidarr
   labels:
-    app.kubernetes.io/name: http-route-lidarr
     app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidarr
+    helm.sh/chart: lidarr-4.5.0
+  namespace: lidarr
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -14,15 +15,16 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - lidarr.alexlebens.net
+    - "lidarr.alexlebens.net"
   rules:
-    - matches:
+    - backendRefs:
+        - group: ""
+          kind: Service
+          name: lidarr
+          namespace: lidarr
+          port: 80
+          weight: 100
+      matches:
         - path:
             type: PathPrefix
             value: /
-      backendRefs:
-        - group: ''
-          kind: Service
-          name: lidarr
-          port: 80
-          weight: 100

clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-backup-garage-local.yaml

@@ -1,27 +1,28 @@
 apiVersion: barmancloud.cnpg.io/v1
 kind: ObjectStore
 metadata:
-  name: "lidarr-postgresql-18-garage-local-backup"
+  name: lidarr-postgresql-18-backup-garage-local
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidarr-postgresql-18-backup-garage-local
 spec:
-  retentionPolicy: 3d
+  retentionPolicy: 7d
   configuration:
     destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster
     endpointURL: http://garage-main.garage:3900
     s3Credentials:
       accessKeyId:
-        name: lidarr-postgresql-18-cluster-backup-secret-garage
+        name: lidarr-postgresql-18-backup-garage-local-secret
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: lidarr-postgresql-18-cluster-backup-secret-garage
+        name: lidarr-postgresql-18-backup-garage-local-secret
         key: ACCESS_SECRET_KEY
       region:
-        name: lidarr-postgresql-18-cluster-backup-secret-garage
+        name: lidarr-postgresql-18-backup-garage-local-secret
         key: ACCESS_REGION

clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml

@@ -4,12 +4,13 @@ metadata:
   name: "lidarr-postgresql-18-recovery"
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: "lidarr-postgresql-18-recovery"
 spec:
   configuration:
     destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster
@@ -22,8 +23,11 @@ spec:
       jobs: 1
     s3Credentials:
       accessKeyId:
-        name: lidarr-postgresql-18-cluster-backup-secret
+        name: lidarr-postgresql-18-recovery-secret
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: lidarr-postgresql-18-cluster-backup-secret
+        name: lidarr-postgresql-18-recovery-secret
         key: ACCESS_SECRET_KEY
+      region:
+        name: lidarr-postgresql-18-recovery-secret
+        key: ACCESS_REGION

clusters/cl01tl/manifests/lidarr/PrometheusRule-lidarr-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: lidarr-postgresql-18-alert-rules
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-scheduled-backup-live-backup.yaml

@@ -1,15 +1,16 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: "lidarr-postgresql-18-live-backup-scheduled-backup"
+  name: "lidarr-postgresql-18-scheduled-backup-live-backup"
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: "lidarr-postgresql-18-scheduled-backup-live-backup"
 spec:
   immediate: true
   suspend: false
@@ -21,4 +22,4 @@ spec:
   pluginConfiguration:
     name: barman-cloud.cloudnative-pg.io
     parameters:
-      barmanObjectName: "lidarr-postgresql-18-garage-local-backup"
+      barmanObjectName: "lidarr-postgresql-18-backup-garage-local"

clusters/cl01tl/manifests/lidarr/ServiceMonitor-lidarr.yaml

@@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: lidarr
-  namespace: lidarr
   labels:
-    app.kubernetes.io/name: lidarr
     app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidarr
+    helm.sh/chart: lidarr-4.5.0
+  namespace: lidarr
 spec:
+  jobLabel: "lidarr"
+  namespaceSelector:
+    matchNames:
+      - lidarr
   selector:
     matchLabels:
-      app.kubernetes.io/name: lidarr
       app.kubernetes.io/instance: lidarr
+      app.kubernetes.io/name: lidarr
   endpoints:
-    - port: metrics
+    - interval: 3m
-      interval: 3m
-      scrapeTimeout: 1m
       path: /metrics
+      port: metrics
+      scrapeTimeout: 1m

clusters/cl01tl/manifests/lidatube/HTTPRoute-lidatube.yaml

@@ -1,12 +1,13 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-lidatube
+  name: lidatube
-  namespace: lidatube
   labels:
-    app.kubernetes.io/name: http-route-lidatube
     app.kubernetes.io/instance: lidatube
-    app.kubernetes.io/part-of: lidatube
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lidatube
+    helm.sh/chart: lidatube-4.5.0
+  namespace: lidatube
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -14,15 +15,16 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - lidatube.alexlebens.net
+    - "lidatube.alexlebens.net"
   rules:
-    - matches:
+    - backendRefs:
+        - group: ""
+          kind: Service
+          name: lidatube
+          namespace: lidatube
+          port: 80
+          weight: 100
+      matches:
         - path:
             type: PathPrefix
             value: /
-      backendRefs:
-        - group: ''
-          kind: Service
-          name: lidatube
-          port: 80
-          weight: 100

clusters/cl01tl/manifests/listenarr/HTTPRoute-listenarr.yaml

@@ -1,12 +1,13 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-listenarr
+  name: listenarr
-  namespace: listenarr
   labels:
-    app.kubernetes.io/name: http-route-listenarr
     app.kubernetes.io/instance: listenarr
-    app.kubernetes.io/part-of: listenarr
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: listenarr
+    helm.sh/chart: listenarr-4.5.0
+  namespace: listenarr
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -14,15 +15,16 @@ spec:
       name: traefik-gateway
       namespace: traefik
   hostnames:
-    - listenarr.alexlebens.net
+    - "listenarr.alexlebens.net"
   rules:
-    - matches:
+    - backendRefs:
+        - group: ""
+          kind: Service
+          name: listenarr
+          namespace: listenarr
+          port: 80
+          weight: 100
+      matches:
         - path:
             type: PathPrefix
             value: /
-      backendRefs:
-        - group: ''
-          kind: Service
-          name: listenarr
-          port: 80
-          weight: 100

clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-cluster
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-database-mautrix-discord
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   name: mautrix-discord

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-database-mautrix-whatsapp
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   name: mautrix-whatsapp

clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml

@@ -0,0 +1,39 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: matrix-synapse-postgresql-18-backup-garage-local-secret
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: postgres-18-cluster-7.4.3
+    app.kubernetes.io/name: matrix-synapse-postgresql-18
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+    app.kubernetes.io/version: "7.4.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-backup-garage-local-secret
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_REGION
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_KEY_ID
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml

@@ -0,0 +1,39 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: matrix-synapse-postgresql-18-recovery-secret
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: postgres-18-cluster-7.4.3
+    app.kubernetes.io/name: matrix-synapse-postgresql-18
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+    app.kubernetes.io/version: "7.4.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-recovery-secret
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_REGION
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_KEY_ID
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml

@@ -1,27 +1,28 @@
 apiVersion: barmancloud.cnpg.io/v1
 kind: ObjectStore
 metadata:
-  name: "matrix-synapse-postgresql-18-garage-local-backup"
+  name: matrix-synapse-postgresql-18-backup-garage-local
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-backup-garage-local
 spec:
-  retentionPolicy: 3d
+  retentionPolicy: 7d
   configuration:
     destinationPath: s3://postgres-backups/cl01tl/matrix-synapse/matrix-synapse-postgresql-18-cluster
     endpointURL: http://garage-main.garage:3900
     s3Credentials:
       accessKeyId:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret-garage
+        name: matrix-synapse-postgresql-18-backup-garage-local-secret
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret-garage
+        name: matrix-synapse-postgresql-18-backup-garage-local-secret
         key: ACCESS_SECRET_KEY
       region:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret-garage
+        name: matrix-synapse-postgresql-18-backup-garage-local-secret
         key: ACCESS_REGION

clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml

@@ -4,12 +4,13 @@ metadata:
   name: "matrix-synapse-postgresql-18-recovery"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: "matrix-synapse-postgresql-18-recovery"
 spec:
   configuration:
     destinationPath: s3://postgres-backups/cl01tl/matrix-synapse/matrix-synapse-postgresql-18-cluster
@@ -22,8 +23,11 @@ spec:
       jobs: 1
     s3Credentials:
       accessKeyId:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret-garage
+        name: matrix-synapse-postgresql-18-recovery-secret
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret-garage
+        name: matrix-synapse-postgresql-18-recovery-secret
         key: ACCESS_SECRET_KEY
+      region:
+        name: matrix-synapse-postgresql-18-recovery-secret
+        key: ACCESS_REGION

clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-alert-rules
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml

@@ -1,15 +1,16 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: "matrix-synapse-postgresql-18-live-backup-scheduled-backup"
+  name: "matrix-synapse-postgresql-18-scheduled-backup-live-backup"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.1.4
+    helm.sh/chart: postgres-18-cluster-7.4.3
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.4"
+    app.kubernetes.io/version: "7.4.3"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: "matrix-synapse-postgresql-18-scheduled-backup-live-backup"
 spec:
   immediate: true
   suspend: false
@@ -21,4 +22,4 @@ spec:
   pluginConfiguration:
     name: barman-cloud.cloudnative-pg.io
     parameters:
-      barmanObjectName: "matrix-synapse-postgresql-18-garage-local-backup"
+      barmanObjectName: "matrix-synapse-postgresql-18-backup-garage-local"

clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-matrix-hookshot.yaml

@@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: matrix-hookshot
-  namespace: matrix-synapse
   labels:
-    app.kubernetes.io/name: matrix-hookshot
     app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: matrix-hookshot
+    helm.sh/chart: matrix-hookshot-4.5.0
+  namespace: matrix-synapse
 spec:
+  jobLabel: "matrix-hookshot"
+  namespaceSelector:
+    matchNames:
+      - matrix-synapse
   selector:
     matchLabels:
+      app.kubernetes.io/instance: matrix-hookshot
       app.kubernetes.io/name: matrix-hookshot
-      app.kubernetes.io/instance: matrix-synapse
   endpoints:
-    - targetPort: 9001
+    - interval: 3m
-      interval: 3m
-      scrapeTimeout: 1m
       path: /metrics
+      scrapeTimeout: 1m
+      targetPort: 9001