From 8bfa05e807ecb4d50fc474d02957f4d51307fee0 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 24 Dec 2025 04:34:45 +0000 Subject: [PATCH] chore: Update manifests after change --- ...e-kube-prometheus-stack-alertmanager.yaml} | 20 +++++----- ...ute-kube-prometheus-stack-prometheus.yaml} | 22 ++++++----- .../Cluster-lidarr-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...r-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...lidarr-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...oute-lidarr.yaml => HTTPRoute-lidarr.yaml} | 26 +++++++------ ...rr-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...ctStore-lidarr-postgresql-18-recovery.yaml | 12 ++++-- ...Rule-lidarr-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../lidarr/ServiceMonitor-lidarr.yaml | 19 +++++---- ...-lidatube.yaml => HTTPRoute-lidatube.yaml} | 26 +++++++------ ...istenarr.yaml => HTTPRoute-listenarr.yaml} | 26 +++++++------ ...-matrix-synapse-postgresql-18-cluster.yaml | 4 +- ...ostgresql-18-database-mautrix-discord.yaml | 4 +- ...stgresql-18-database-mautrix-whatsapp.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...synapse-postgresql-18-recovery-secret.yaml | 39 +++++++++++++++++++ ...se-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...matrix-synapse-postgresql-18-recovery.yaml | 12 ++++-- ...rix-synapse-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../ServiceMonitor-matrix-hookshot.yaml | 19 +++++---- 24 files changed, 273 insertions(+), 148 deletions(-) rename clusters/cl01tl/manifests/kube-prometheus-stack/{HTTPRoute-http-route-alertmanager.yaml => HTTPRoute-kube-prometheus-stack-alertmanager.yaml} (58%) rename clusters/cl01tl/manifests/kube-prometheus-stack/{HTTPRoute-http-route-prometheus.yaml => HTTPRoute-kube-prometheus-stack-prometheus.yaml} (54%) create mode 100644 clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/lidarr/{ExternalSecret-lidarr-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-lidarr-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/lidarr/{HTTPRoute-http-route-lidarr.yaml => HTTPRoute-lidarr.yaml} (65%) rename clusters/cl01tl/manifests/lidarr/{ObjectStore-lidarr-postgresql-18-garage-local-backup.yaml => ObjectStore-lidarr-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/lidarr/{ScheduledBackup-lidarr-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-lidarr-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/lidatube/{HTTPRoute-http-route-lidatube.yaml => HTTPRoute-lidatube.yaml} (64%) rename clusters/cl01tl/manifests/listenarr/{HTTPRoute-http-route-listenarr.yaml => HTTPRoute-listenarr.yaml} (64%) create mode 100644 clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml create mode 100644 clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml rename clusters/cl01tl/manifests/matrix-synapse/{ObjectStore-matrix-synapse-postgresql-18-garage-local-backup.yaml => ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/matrix-synapse/{ScheduledBackup-matrix-synapse-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml} (63%) diff --git a/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-alertmanager.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-alertmanager.yaml similarity index 58% rename from clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-alertmanager.yaml rename to clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-alertmanager.yaml index e1850a2d7..b32277f02 100644 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-alertmanager.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-prometheus.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-prometheus.yaml similarity index 54% rename from clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-prometheus.yaml rename to clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-kube-prometheus-stack-prometheus.yaml index b661cff60..b8d77ae4c 100644 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/HTTPRoute-http-route-prometheus.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml index d82399eb5..b2af2eab3 100644 --- a/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..23b441faf --- /dev/null +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index d3c8c5bb2..000000000 --- a/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -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 diff --git a/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-recovery-secret.yaml index 28b71fbb5..4aaba797c 100644 --- a/clusters/cl01tl/manifests/lidarr/ExternalSecret-lidarr-postgresql-18-cluster-backup-secret-garage.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/HTTPRoute-http-route-lidarr.yaml b/clusters/cl01tl/manifests/lidarr/HTTPRoute-lidarr.yaml similarity index 65% rename from clusters/cl01tl/manifests/lidarr/HTTPRoute-http-route-lidarr.yaml rename to clusters/cl01tl/manifests/lidarr/HTTPRoute-lidarr.yaml index f4945bba8..0546f731c 100644 --- a/clusters/cl01tl/manifests/lidarr/HTTPRoute-http-route-lidarr.yaml +++ b/clusters/cl01tl/manifests/lidarr/HTTPRoute-lidarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-lidarr - namespace: lidarr + name: 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 diff --git a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-backup-garage-local.yaml index a4bfe6e6a..b97730e56 100644 --- a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-garage-local-backup.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml index 22172239d..ec2d64ecf 100644 --- a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/lidarr/PrometheusRule-lidarr-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/lidarr/PrometheusRule-lidarr-postgresql-18-alert-rules.yaml index 628256dae..ac4d291b4 100644 --- a/clusters/cl01tl/manifests/lidarr/PrometheusRule-lidarr-postgresql-18-alert-rules.yaml +++ b/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: diff --git a/clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-scheduled-backup-live-backup.yaml index b62bb1fd9..dd313b5c8 100644 --- a/clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-live-backup-scheduled-backup.yaml +++ b/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" diff --git a/clusters/cl01tl/manifests/lidarr/ServiceMonitor-lidarr.yaml b/clusters/cl01tl/manifests/lidarr/ServiceMonitor-lidarr.yaml index 3cb7b1a0c..eb90c935d 100644 --- a/clusters/cl01tl/manifests/lidarr/ServiceMonitor-lidarr.yaml +++ b/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 - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/lidatube/HTTPRoute-http-route-lidatube.yaml b/clusters/cl01tl/manifests/lidatube/HTTPRoute-lidatube.yaml similarity index 64% rename from clusters/cl01tl/manifests/lidatube/HTTPRoute-http-route-lidatube.yaml rename to clusters/cl01tl/manifests/lidatube/HTTPRoute-lidatube.yaml index f28f62a27..37ac4a0e5 100644 --- a/clusters/cl01tl/manifests/lidatube/HTTPRoute-http-route-lidatube.yaml +++ b/clusters/cl01tl/manifests/lidatube/HTTPRoute-lidatube.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-lidatube - namespace: lidatube + name: 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 diff --git a/clusters/cl01tl/manifests/listenarr/HTTPRoute-http-route-listenarr.yaml b/clusters/cl01tl/manifests/listenarr/HTTPRoute-listenarr.yaml similarity index 64% rename from clusters/cl01tl/manifests/listenarr/HTTPRoute-http-route-listenarr.yaml rename to clusters/cl01tl/manifests/listenarr/HTTPRoute-listenarr.yaml index c1ed3c075..f448d695c 100644 --- a/clusters/cl01tl/manifests/listenarr/HTTPRoute-http-route-listenarr.yaml +++ b/clusters/cl01tl/manifests/listenarr/HTTPRoute-listenarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-listenarr - namespace: listenarr + name: 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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml index 98e75527d..af7aa01d4 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml index e1ff01a76..97b3ae4e1 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml index fee5e6d20..8ec2e1077 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..3019098af --- /dev/null +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml new file mode 100644 index 000000000..6b6a2eeec --- /dev/null +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml index a32b41404..15bbe746c 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-garage-local-backup.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml index b4470a2af..0f4bedce2 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml +++ b/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 diff --git a/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml index 1b1aad8c0..8b818d66a 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml +++ b/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: diff --git a/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml index b4a190b1b..b78ff9295 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-live-backup-scheduled-backup.yaml +++ b/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" diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-matrix-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-matrix-hookshot.yaml index 1309bf09a..60d07f5e1 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-matrix-hookshot.yaml +++ b/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 - scrapeTimeout: 1m + - interval: 3m path: /metrics + scrapeTimeout: 1m + targetPort: 9001