From c513fd8f296f0846e19211c12706dbdeb366757b Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 24 Dec 2025 06:07:40 +0000 Subject: [PATCH] chore: Update manifests after change --- ...-route-seerr.yaml => HTTPRoute-seerr.yaml} | 4 +- .../ServiceMonitor-shelly-plug.yaml | 19 +++++---- ...-route-slskd.yaml => HTTPRoute-slskd.yaml} | 26 +++++++------ .../manifests/slskd/ServiceMonitor-slskd.yaml | 19 +++++---- ...uster-sonarr-4k-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...k-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...arr-4k-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...onarr-4k.yaml => HTTPRoute-sonarr-4k.yaml} | 26 +++++++------ ...4k-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...tore-sonarr-4k-postgresql-18-recovery.yaml | 12 ++++-- ...e-sonarr-4k-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../sonarr-4k/ServiceMonitor-sonarr-4k.yaml | 19 +++++---- ...er-sonarr-anime-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...e-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...-anime-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...anime.yaml => HTTPRoute-sonarr-anime.yaml} | 26 +++++++------ ...me-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...e-sonarr-anime-postgresql-18-recovery.yaml | 12 ++++-- ...onarr-anime-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../ServiceMonitor-sonarr-anime.yaml | 19 +++++---- .../Cluster-sonarr-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...r-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...sonarr-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...oute-sonarr.yaml => HTTPRoute-sonarr.yaml} | 26 +++++++------ ...rr-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...ctStore-sonarr-postgresql-18-recovery.yaml | 12 ++++-- ...Rule-sonarr-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../sonarr/ServiceMonitor-sonarr.yaml | 19 +++++---- 34 files changed, 349 insertions(+), 253 deletions(-) rename clusters/cl01tl/manifests/seerr/{HTTPRoute-http-route-seerr.yaml => HTTPRoute-seerr.yaml} (89%) rename clusters/cl01tl/manifests/slskd/{HTTPRoute-http-route-slskd.yaml => HTTPRoute-slskd.yaml} (66%) create mode 100644 clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/sonarr-4k/{ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-sonarr-4k-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/sonarr-4k/{HTTPRoute-http-route-sonarr-4k.yaml => HTTPRoute-sonarr-4k.yaml} (64%) rename clusters/cl01tl/manifests/sonarr-4k/{ObjectStore-sonarr-4k-postgresql-18-garage-local-backup.yaml => ObjectStore-sonarr-4k-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/sonarr-4k/{ScheduledBackup-sonarr-4k-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-sonarr-4k-postgresql-18-scheduled-backup-live-backup.yaml} (63%) create mode 100644 clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/sonarr-anime/{ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-sonarr-anime-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/sonarr-anime/{HTTPRoute-http-route-sonarr-anime.yaml => HTTPRoute-sonarr-anime.yaml} (63%) rename clusters/cl01tl/manifests/sonarr-anime/{ObjectStore-sonarr-anime-postgresql-18-garage-local-backup.yaml => ObjectStore-sonarr-anime-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/sonarr-anime/{ScheduledBackup-sonarr-anime-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-sonarr-anime-postgresql-18-scheduled-backup-live-backup.yaml} (63%) create mode 100644 clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/sonarr/{ExternalSecret-sonarr-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-sonarr-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/sonarr/{HTTPRoute-http-route-sonarr.yaml => HTTPRoute-sonarr.yaml} (65%) rename clusters/cl01tl/manifests/sonarr/{ObjectStore-sonarr-postgresql-18-garage-local-backup.yaml => ObjectStore-sonarr-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/sonarr/{ScheduledBackup-sonarr-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-sonarr-postgresql-18-scheduled-backup-live-backup.yaml} (63%) diff --git a/clusters/cl01tl/manifests/seerr/HTTPRoute-http-route-seerr.yaml b/clusters/cl01tl/manifests/seerr/HTTPRoute-seerr.yaml similarity index 89% rename from clusters/cl01tl/manifests/seerr/HTTPRoute-http-route-seerr.yaml rename to clusters/cl01tl/manifests/seerr/HTTPRoute-seerr.yaml index 333c95010..53c8cc3d4 100644 --- a/clusters/cl01tl/manifests/seerr/HTTPRoute-http-route-seerr.yaml +++ b/clusters/cl01tl/manifests/seerr/HTTPRoute-seerr.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-seerr + name: seerr namespace: seerr labels: - app.kubernetes.io/name: http-route-seerr + app.kubernetes.io/name: seerr app.kubernetes.io/instance: seerr app.kubernetes.io/part-of: seerr spec: diff --git a/clusters/cl01tl/manifests/shelly-plug/ServiceMonitor-shelly-plug.yaml b/clusters/cl01tl/manifests/shelly-plug/ServiceMonitor-shelly-plug.yaml index 9046cf742..d10d1edb2 100644 --- a/clusters/cl01tl/manifests/shelly-plug/ServiceMonitor-shelly-plug.yaml +++ b/clusters/cl01tl/manifests/shelly-plug/ServiceMonitor-shelly-plug.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: shelly-plug - namespace: shelly-plug labels: - app.kubernetes.io/name: shelly-plug app.kubernetes.io/instance: shelly-plug - app.kubernetes.io/part-of: shelly-plug + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: shelly-plug + helm.sh/chart: shelly-plug-4.5.0 + namespace: shelly-plug spec: + jobLabel: "shelly-plug" + namespaceSelector: + matchNames: + - shelly-plug selector: matchLabels: - app.kubernetes.io/name: shelly-plug app.kubernetes.io/instance: shelly-plug + app.kubernetes.io/name: shelly-plug endpoints: - - port: metrics - interval: 30s - scrapeTimeout: 10s + - interval: 30s path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/slskd/HTTPRoute-http-route-slskd.yaml b/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml similarity index 66% rename from clusters/cl01tl/manifests/slskd/HTTPRoute-http-route-slskd.yaml rename to clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml index 44b4bf7a8..f35058fe6 100644 --- a/clusters/cl01tl/manifests/slskd/HTTPRoute-http-route-slskd.yaml +++ b/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-slskd - namespace: slskd + name: slskd labels: - app.kubernetes.io/name: http-route-slskd app.kubernetes.io/instance: slskd - app.kubernetes.io/part-of: slskd + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: slskd + helm.sh/chart: slskd-4.5.0 + namespace: slskd spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - slskd.alexlebens.net + - "slskd.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: slskd + namespace: slskd + port: 5030 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: slskd - port: 5030 - weight: 100 diff --git a/clusters/cl01tl/manifests/slskd/ServiceMonitor-slskd.yaml b/clusters/cl01tl/manifests/slskd/ServiceMonitor-slskd.yaml index 1168ec200..ff36620da 100644 --- a/clusters/cl01tl/manifests/slskd/ServiceMonitor-slskd.yaml +++ b/clusters/cl01tl/manifests/slskd/ServiceMonitor-slskd.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: slskd - namespace: slskd labels: - app.kubernetes.io/name: slskd app.kubernetes.io/instance: slskd - app.kubernetes.io/part-of: slskd + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: slskd + helm.sh/chart: slskd-4.5.0 + namespace: slskd spec: + jobLabel: "slskd" + namespaceSelector: + matchNames: + - slskd selector: matchLabels: - app.kubernetes.io/name: slskd app.kubernetes.io/instance: slskd + app.kubernetes.io/name: slskd endpoints: - - port: http - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: http + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/sonarr-4k/Cluster-sonarr-4k-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/sonarr-4k/Cluster-sonarr-4k-postgresql-18-cluster.yaml index 1a9f5f116..524906e60 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/Cluster-sonarr-4k-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/Cluster-sonarr-4k-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-4k-postgresql-18-cluster namespace: sonarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k - 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/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..9323cd24f --- /dev/null +++ b/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: sonarr-4k-postgresql-18-backup-garage-local-secret + namespace: sonarr-4k + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-4k-postgresql-18 + app.kubernetes.io/instance: sonarr-4k + app.kubernetes.io/part-of: sonarr-4k + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-4k-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/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 6b9575909..000000000 --- a/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: sonarr-4k-postgresql-18-cluster-backup-secret - namespace: sonarr-4k - labels: - app.kubernetes.io/name: sonarr-4k-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: sonarr-4k - app.kubernetes.io/part-of: sonarr-4k -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/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-recovery-secret.yaml index 97166a2e3..b53dfd014 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/ExternalSecret-sonarr-4k-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-recovery-secret namespace: sonarr-4k labels: - app.kubernetes.io/name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-4k-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/sonarr-4k/HTTPRoute-http-route-sonarr-4k.yaml b/clusters/cl01tl/manifests/sonarr-4k/HTTPRoute-sonarr-4k.yaml similarity index 64% rename from clusters/cl01tl/manifests/sonarr-4k/HTTPRoute-http-route-sonarr-4k.yaml rename to clusters/cl01tl/manifests/sonarr-4k/HTTPRoute-sonarr-4k.yaml index b30a9d7ed..1df8e9482 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/HTTPRoute-http-route-sonarr-4k.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/HTTPRoute-sonarr-4k.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-sonarr-4k - namespace: sonarr-4k + name: sonarr-4k labels: - app.kubernetes.io/name: http-route-sonarr-4k app.kubernetes.io/instance: sonarr-4k - app.kubernetes.io/part-of: sonarr-4k + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-4k + helm.sh/chart: sonarr-4k-4.5.0 + namespace: sonarr-4k spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - sonarr-4k.alexlebens.net + - "sonarr-4k.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: sonarr-4k + namespace: sonarr-4k + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: sonarr-4k - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-backup-garage-local.yaml index 5a7abd48d..074a46f2b 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "sonarr-4k-postgresql-18-garage-local-backup" + name: sonarr-4k-postgresql-18-backup-garage-local namespace: sonarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-4k-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr-4k/sonarr-4k-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-recovery.yaml index da26afb0d..8de8cea86 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/ObjectStore-sonarr-4k-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "sonarr-4k-postgresql-18-recovery" namespace: sonarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-4k-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr-4k/sonarr-4k-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-4k-postgresql-18-cluster-backup-secret-garage + name: sonarr-4k-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: sonarr-4k-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr-4k/PrometheusRule-sonarr-4k-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/sonarr-4k/PrometheusRule-sonarr-4k-postgresql-18-alert-rules.yaml index d748b0731..4a6c4fe5d 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/PrometheusRule-sonarr-4k-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/PrometheusRule-sonarr-4k-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-4k-postgresql-18-alert-rules namespace: sonarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k - 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/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-scheduled-backup-live-backup.yaml index 6d0153ea3..c419f096a 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/ScheduledBackup-sonarr-4k-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "sonarr-4k-postgresql-18-live-backup-scheduled-backup" + name: "sonarr-4k-postgresql-18-scheduled-backup-live-backup" namespace: sonarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-4k-postgresql-18 app.kubernetes.io/instance: sonarr-4k app.kubernetes.io/part-of: sonarr-4k - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-4k-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: "sonarr-4k-postgresql-18-garage-local-backup" + barmanObjectName: "sonarr-4k-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/sonarr-4k/ServiceMonitor-sonarr-4k.yaml b/clusters/cl01tl/manifests/sonarr-4k/ServiceMonitor-sonarr-4k.yaml index 7cb7e9332..187960be3 100644 --- a/clusters/cl01tl/manifests/sonarr-4k/ServiceMonitor-sonarr-4k.yaml +++ b/clusters/cl01tl/manifests/sonarr-4k/ServiceMonitor-sonarr-4k.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: sonarr-4k - namespace: sonarr-4k labels: - app.kubernetes.io/name: sonarr-4k app.kubernetes.io/instance: sonarr-4k - app.kubernetes.io/part-of: sonarr-4k + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-4k + helm.sh/chart: sonarr-4k-4.5.0 + namespace: sonarr-4k spec: + jobLabel: "sonarr-4k" + namespaceSelector: + matchNames: + - sonarr-4k selector: matchLabels: - app.kubernetes.io/name: sonarr-4k app.kubernetes.io/instance: sonarr-4k + app.kubernetes.io/name: sonarr-4k endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/sonarr-anime/Cluster-sonarr-anime-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/sonarr-anime/Cluster-sonarr-anime-postgresql-18-cluster.yaml index 1ed047fd0..37d3454c6 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/Cluster-sonarr-anime-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/Cluster-sonarr-anime-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-anime-postgresql-18-cluster namespace: sonarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime - 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/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..b57670181 --- /dev/null +++ b/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: sonarr-anime-postgresql-18-backup-garage-local-secret + namespace: sonarr-anime + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-anime-postgresql-18 + app.kubernetes.io/instance: sonarr-anime + app.kubernetes.io/part-of: sonarr-anime + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-anime-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/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 2a6a482ba..000000000 --- a/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: sonarr-anime-postgresql-18-cluster-backup-secret - namespace: sonarr-anime - labels: - app.kubernetes.io/name: sonarr-anime-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: sonarr-anime - app.kubernetes.io/part-of: sonarr-anime -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/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-recovery-secret.yaml index f0a325bca..7498c00bf 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/ExternalSecret-sonarr-anime-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-recovery-secret namespace: sonarr-anime labels: - app.kubernetes.io/name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-anime-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/sonarr-anime/HTTPRoute-http-route-sonarr-anime.yaml b/clusters/cl01tl/manifests/sonarr-anime/HTTPRoute-sonarr-anime.yaml similarity index 63% rename from clusters/cl01tl/manifests/sonarr-anime/HTTPRoute-http-route-sonarr-anime.yaml rename to clusters/cl01tl/manifests/sonarr-anime/HTTPRoute-sonarr-anime.yaml index a2c5a3075..a7bd732cf 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/HTTPRoute-http-route-sonarr-anime.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/HTTPRoute-sonarr-anime.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-sonarr-anime - namespace: sonarr-anime + name: sonarr-anime labels: - app.kubernetes.io/name: http-route-sonarr-anime app.kubernetes.io/instance: sonarr-anime - app.kubernetes.io/part-of: sonarr-anime + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-anime + helm.sh/chart: sonarr-anime-4.5.0 + namespace: sonarr-anime spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - sonarr-anime.alexlebens.net + - "sonarr-anime.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: sonarr-anime + namespace: sonarr-anime + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: sonarr-anime - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-backup-garage-local.yaml index 29fd06d7c..b07bffe84 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "sonarr-anime-postgresql-18-garage-local-backup" + name: sonarr-anime-postgresql-18-backup-garage-local namespace: sonarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-anime-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-recovery.yaml index 636e9ef0f..6dd330060 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/ObjectStore-sonarr-anime-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "sonarr-anime-postgresql-18-recovery" namespace: sonarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-anime-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-anime-postgresql-18-cluster-backup-secret-garage + name: sonarr-anime-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: sonarr-anime-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr-anime/PrometheusRule-sonarr-anime-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/sonarr-anime/PrometheusRule-sonarr-anime-postgresql-18-alert-rules.yaml index dfd2ca8c4..a0572065e 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/PrometheusRule-sonarr-anime-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/PrometheusRule-sonarr-anime-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-anime-postgresql-18-alert-rules namespace: sonarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime - 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/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-scheduled-backup-live-backup.yaml index eb0dbb35e..e6f3a50ff 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/ScheduledBackup-sonarr-anime-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "sonarr-anime-postgresql-18-live-backup-scheduled-backup" + name: "sonarr-anime-postgresql-18-scheduled-backup-live-backup" namespace: sonarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-anime-postgresql-18 app.kubernetes.io/instance: sonarr-anime app.kubernetes.io/part-of: sonarr-anime - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-anime-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: "sonarr-anime-postgresql-18-garage-local-backup" + barmanObjectName: "sonarr-anime-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/sonarr-anime/ServiceMonitor-sonarr-anime.yaml b/clusters/cl01tl/manifests/sonarr-anime/ServiceMonitor-sonarr-anime.yaml index 7d70ca56e..9fb55fb96 100644 --- a/clusters/cl01tl/manifests/sonarr-anime/ServiceMonitor-sonarr-anime.yaml +++ b/clusters/cl01tl/manifests/sonarr-anime/ServiceMonitor-sonarr-anime.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: sonarr-anime - namespace: sonarr-anime labels: - app.kubernetes.io/name: sonarr-anime app.kubernetes.io/instance: sonarr-anime - app.kubernetes.io/part-of: sonarr-anime + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-anime + helm.sh/chart: sonarr-anime-4.5.0 + namespace: sonarr-anime spec: + jobLabel: "sonarr-anime" + namespaceSelector: + matchNames: + - sonarr-anime selector: matchLabels: - app.kubernetes.io/name: sonarr-anime app.kubernetes.io/instance: sonarr-anime + app.kubernetes.io/name: sonarr-anime endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/sonarr/Cluster-sonarr-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/sonarr/Cluster-sonarr-postgresql-18-cluster.yaml index 9df8cf982..24d74347c 100644 --- a/clusters/cl01tl/manifests/sonarr/Cluster-sonarr-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/sonarr/Cluster-sonarr-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-postgresql-18-cluster namespace: sonarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr - 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/sonarr/ExternalSecret-sonarr-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..003d92f12 --- /dev/null +++ b/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: sonarr-postgresql-18-backup-garage-local-secret + namespace: sonarr + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-postgresql-18 + app.kubernetes.io/instance: sonarr + app.kubernetes.io/part-of: sonarr + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-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/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index d3d6134af..000000000 --- a/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: sonarr-postgresql-18-cluster-backup-secret - namespace: sonarr - labels: - app.kubernetes.io/name: sonarr-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: sonarr - app.kubernetes.io/part-of: sonarr -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/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-recovery-secret.yaml index b828081bc..1216494b0 100644 --- a/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/sonarr/ExternalSecret-sonarr-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-recovery-secret namespace: sonarr labels: - app.kubernetes.io/name: sonarr-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-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/sonarr/HTTPRoute-http-route-sonarr.yaml b/clusters/cl01tl/manifests/sonarr/HTTPRoute-sonarr.yaml similarity index 65% rename from clusters/cl01tl/manifests/sonarr/HTTPRoute-http-route-sonarr.yaml rename to clusters/cl01tl/manifests/sonarr/HTTPRoute-sonarr.yaml index 4877b6d81..1f5cc2c4e 100644 --- a/clusters/cl01tl/manifests/sonarr/HTTPRoute-http-route-sonarr.yaml +++ b/clusters/cl01tl/manifests/sonarr/HTTPRoute-sonarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-sonarr - namespace: sonarr + name: sonarr labels: - app.kubernetes.io/name: http-route-sonarr app.kubernetes.io/instance: sonarr - app.kubernetes.io/part-of: sonarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr + helm.sh/chart: sonarr-4.5.0 + namespace: sonarr spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - sonarr.alexlebens.net + - "sonarr.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: sonarr + namespace: sonarr + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: sonarr - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-backup-garage-local.yaml index 0dc627ff9..e6aea469c 100644 --- a/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "sonarr-postgresql-18-garage-local-backup" + name: sonarr-postgresql-18-backup-garage-local namespace: sonarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr/sonarr-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-recovery.yaml index bdbc4ea3b..a7ad0cf9b 100644 --- a/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/sonarr/ObjectStore-sonarr-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "sonarr-postgresql-18-recovery" namespace: sonarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/sonarr/sonarr-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: sonarr-postgresql-18-cluster-backup-secret-garage + name: sonarr-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: sonarr-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/sonarr/PrometheusRule-sonarr-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/sonarr/PrometheusRule-sonarr-postgresql-18-alert-rules.yaml index f4bfe216c..0bd9fa148 100644 --- a/clusters/cl01tl/manifests/sonarr/PrometheusRule-sonarr-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/sonarr/PrometheusRule-sonarr-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: sonarr-postgresql-18-alert-rules namespace: sonarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr - 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/sonarr/ScheduledBackup-sonarr-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/sonarr/ScheduledBackup-sonarr-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/sonarr/ScheduledBackup-sonarr-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/sonarr/ScheduledBackup-sonarr-postgresql-18-scheduled-backup-live-backup.yaml index c39eaa400..a560cf4a4 100644 --- a/clusters/cl01tl/manifests/sonarr/ScheduledBackup-sonarr-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/sonarr/ScheduledBackup-sonarr-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "sonarr-postgresql-18-live-backup-scheduled-backup" + name: "sonarr-postgresql-18-scheduled-backup-live-backup" namespace: sonarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: sonarr-postgresql-18 app.kubernetes.io/instance: sonarr app.kubernetes.io/part-of: sonarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "sonarr-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: "sonarr-postgresql-18-garage-local-backup" + barmanObjectName: "sonarr-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/sonarr/ServiceMonitor-sonarr.yaml b/clusters/cl01tl/manifests/sonarr/ServiceMonitor-sonarr.yaml index 89474596c..e8f94d91e 100644 --- a/clusters/cl01tl/manifests/sonarr/ServiceMonitor-sonarr.yaml +++ b/clusters/cl01tl/manifests/sonarr/ServiceMonitor-sonarr.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: sonarr - namespace: sonarr labels: - app.kubernetes.io/name: sonarr app.kubernetes.io/instance: sonarr - app.kubernetes.io/part-of: sonarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: sonarr + helm.sh/chart: sonarr-4.5.0 + namespace: sonarr spec: + jobLabel: "sonarr" + namespaceSelector: + matchNames: + - sonarr selector: matchLabels: - app.kubernetes.io/name: sonarr app.kubernetes.io/instance: sonarr + app.kubernetes.io/name: sonarr endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m