diff --git a/clusters/cl01tl/manifests/prowlarr/HTTPRoute-http-route-prowlarr.yaml b/clusters/cl01tl/manifests/prowlarr/HTTPRoute-prowlarr.yaml similarity index 64% rename from clusters/cl01tl/manifests/prowlarr/HTTPRoute-http-route-prowlarr.yaml rename to clusters/cl01tl/manifests/prowlarr/HTTPRoute-prowlarr.yaml index 213c9ba13..667242b41 100644 --- a/clusters/cl01tl/manifests/prowlarr/HTTPRoute-http-route-prowlarr.yaml +++ b/clusters/cl01tl/manifests/prowlarr/HTTPRoute-prowlarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-prowlarr - namespace: prowlarr + name: prowlarr labels: - app.kubernetes.io/name: http-route-prowlarr app.kubernetes.io/instance: prowlarr - app.kubernetes.io/part-of: prowlarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: prowlarr + helm.sh/chart: prowlarr-4.5.0 + namespace: prowlarr spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - prowlarr.alexlebens.net + - "prowlarr.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: prowlarr + namespace: prowlarr + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: prowlarr - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qbittorrent.yaml b/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-main.yaml similarity index 63% rename from clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qbittorrent.yaml rename to clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-main.yaml index 364ce930d..7c68d141b 100644 --- a/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qbittorrent.yaml +++ b/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-main.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-qbittorrent - namespace: qbittorrent + name: qbittorrent-main labels: - app.kubernetes.io/name: http-route-qbittorrent app.kubernetes.io/instance: qbittorrent - app.kubernetes.io/part-of: qbittorrent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: qbittorrent + helm.sh/chart: qbittorrent-4.5.0 + namespace: qbittorrent spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - qbittorrent.alexlebens.net + - "qbittorrent.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: qbittorrent + namespace: qbittorrent + port: 8080 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: qbittorrent - port: 8080 - weight: 100 diff --git a/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qui.yaml b/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-qui.yaml similarity index 64% rename from clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qui.yaml rename to clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-qui.yaml index a997bf743..851e71298 100644 --- a/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-http-route-qui.yaml +++ b/clusters/cl01tl/manifests/qbittorrent/HTTPRoute-qbittorrent-qui.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-qui - namespace: qbittorrent + name: qbittorrent-qui labels: - app.kubernetes.io/name: http-route-qui app.kubernetes.io/instance: qbittorrent - app.kubernetes.io/part-of: qbittorrent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: qbittorrent + helm.sh/chart: qbittorrent-4.5.0 + namespace: qbittorrent spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - qui.alexlebens.net + - "qui.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: qbittorrent-qui + namespace: qbittorrent + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: qbittorrent-qui - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-apprise.yaml b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-apprise.yaml index 3939a1aed..b89d707ab 100644 --- a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-apprise.yaml +++ b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-apprise.yaml @@ -2,19 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: qbittorrent-apprise - namespace: qbittorrent labels: - app.kubernetes.io/name: qbittorrent-apprise app.kubernetes.io/instance: qbittorrent - app.kubernetes.io/part-of: qbittorrent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: qbittorrent + helm.sh/chart: qbittorrent-4.5.0 + namespace: qbittorrent spec: - endpoints: - - port: apprise - interval: 30s - scrapeTimeout: 15s - path: /metrics + jobLabel: "qbittorrent-apprise" + namespaceSelector: + matchNames: + - qbittorrent selector: matchLabels: - app.kubernetes.io/service: qbittorrent-qbit-manage - app.kubernetes.io/name: qbittorrent - app.kubernetes.io/instance: qbittorrent + app.kubernetes.io/instance: qbittorrent-apprise + app.kubernetes.io/name: qbittorrent-apprise + endpoints: + - interval: 30s + path: /metrics + port: apprise + scrapeTimeout: 15s diff --git a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent.yaml b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-main.yaml similarity index 61% rename from clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent.yaml rename to clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-main.yaml index 002b0c96f..af3ea4a3d 100644 --- a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent.yaml +++ b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-main.yaml @@ -1,20 +1,24 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: qbittorrent - namespace: qbittorrent + name: qbittorrent-main labels: - app.kubernetes.io/name: qbittorrent app.kubernetes.io/instance: qbittorrent - app.kubernetes.io/part-of: qbittorrent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: qbittorrent + helm.sh/chart: qbittorrent-4.5.0 + namespace: qbittorrent spec: - endpoints: - - port: metrics - interval: 30s - scrapeTimeout: 15s - path: /metrics + jobLabel: "qbittorrent-main" + namespaceSelector: + matchNames: + - qbittorrent selector: matchLabels: - app.kubernetes.io/service: qbittorrent - app.kubernetes.io/name: qbittorrent app.kubernetes.io/instance: qbittorrent + app.kubernetes.io/name: qbittorrent + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 15s diff --git a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-qui.yaml b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-qui.yaml index d9f062e55..a8e9c6f97 100644 --- a/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-qui.yaml +++ b/clusters/cl01tl/manifests/qbittorrent/ServiceMonitor-qbittorrent-qui.yaml @@ -2,19 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: qbittorrent-qui - namespace: qbittorrent labels: - app.kubernetes.io/name: qbittorrent-qui app.kubernetes.io/instance: qbittorrent - app.kubernetes.io/part-of: qbittorrent + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: qbittorrent + helm.sh/chart: qbittorrent-4.5.0 + namespace: qbittorrent spec: - endpoints: - - port: metrics - interval: 30s - scrapeTimeout: 15s - path: /metrics + jobLabel: "qbittorrent-qui" + namespaceSelector: + matchNames: + - qbittorrent selector: matchLabels: - app.kubernetes.io/service: qbittorrent-qui - app.kubernetes.io/name: qbittorrent - app.kubernetes.io/instance: qbittorrent + app.kubernetes.io/instance: qbittorrent-qui + app.kubernetes.io/name: qbittorrent-qui + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 15s diff --git a/clusters/cl01tl/manifests/radarr-4k/Cluster-radarr-4k-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/radarr-4k/Cluster-radarr-4k-postgresql-18-cluster.yaml index f5e6af99b..81bc2f57d 100644 --- a/clusters/cl01tl/manifests/radarr-4k/Cluster-radarr-4k-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/Cluster-radarr-4k-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-4k-postgresql-18-cluster namespace: radarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-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/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..170ed385b --- /dev/null +++ b/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: radarr-4k-postgresql-18-backup-garage-local-secret + namespace: radarr-4k + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-4k-postgresql-18 + app.kubernetes.io/instance: radarr-4k + app.kubernetes.io/part-of: radarr-4k + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 44c1a88b6..000000000 --- a/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: radarr-4k-postgresql-18-cluster-backup-secret - namespace: radarr-4k - labels: - app.kubernetes.io/name: radarr-4k-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: radarr-4k - app.kubernetes.io/part-of: radarr-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/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-recovery-secret.yaml index 959f1d17d..518139755 100644 --- a/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/ExternalSecret-radarr-4k-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-recovery-secret namespace: radarr-4k labels: - app.kubernetes.io/name: radarr-4k-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-4k + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr-4k/HTTPRoute-http-route-radarr-4k.yaml b/clusters/cl01tl/manifests/radarr-4k/HTTPRoute-radarr-4k.yaml similarity index 64% rename from clusters/cl01tl/manifests/radarr-4k/HTTPRoute-http-route-radarr-4k.yaml rename to clusters/cl01tl/manifests/radarr-4k/HTTPRoute-radarr-4k.yaml index 10eae585a..913b0128c 100644 --- a/clusters/cl01tl/manifests/radarr-4k/HTTPRoute-http-route-radarr-4k.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/HTTPRoute-radarr-4k.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-radarr-4k - namespace: radarr-4k + name: radarr-4k labels: - app.kubernetes.io/name: http-route-radarr-4k app.kubernetes.io/instance: radarr-4k - app.kubernetes.io/part-of: radarr-4k + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-4k + helm.sh/chart: radarr-4k-4.5.0 + namespace: radarr-4k spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - radarr-4k.alexlebens.net + - "radarr-4k.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: radarr-4k + namespace: radarr-4k + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: radarr-4k - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-backup-garage-local.yaml index c6a227e2a..520ccecb9 100644 --- a/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "radarr-4k-postgresql-18-garage-local-backup" + name: radarr-4k-postgresql-18-backup-garage-local namespace: radarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-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: radarr-4k-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-4k/radarr-4k-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-recovery.yaml index f76448312..c43d1a9e5 100644 --- a/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/ObjectStore-radarr-4k-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "radarr-4k-postgresql-18-recovery" namespace: radarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-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: "radarr-4k-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-4k/radarr-4k-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-4k-postgresql-18-cluster-backup-secret-garage + name: radarr-4k-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: radarr-4k-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-4k/PrometheusRule-radarr-4k-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/radarr-4k/PrometheusRule-radarr-4k-postgresql-18-alert-rules.yaml index c5f378446..1d47a1a2e 100644 --- a/clusters/cl01tl/manifests/radarr-4k/PrometheusRule-radarr-4k-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/PrometheusRule-radarr-4k-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-4k-postgresql-18-alert-rules namespace: radarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-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/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-scheduled-backup-live-backup.yaml index 980f59f8e..a354edfa5 100644 --- a/clusters/cl01tl/manifests/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/ScheduledBackup-radarr-4k-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "radarr-4k-postgresql-18-live-backup-scheduled-backup" + name: "radarr-4k-postgresql-18-scheduled-backup-live-backup" namespace: radarr-4k labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-4k-postgresql-18 app.kubernetes.io/instance: radarr-4k app.kubernetes.io/part-of: radarr-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: "radarr-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: "radarr-4k-postgresql-18-garage-local-backup" + barmanObjectName: "radarr-4k-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/radarr-4k/ServiceMonitor-radarr-4k.yaml b/clusters/cl01tl/manifests/radarr-4k/ServiceMonitor-radarr-4k.yaml index 9b4e4358f..c7911e964 100644 --- a/clusters/cl01tl/manifests/radarr-4k/ServiceMonitor-radarr-4k.yaml +++ b/clusters/cl01tl/manifests/radarr-4k/ServiceMonitor-radarr-4k.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: radarr-4k - namespace: radarr-4k labels: - app.kubernetes.io/name: radarr-4k app.kubernetes.io/instance: radarr-4k - app.kubernetes.io/part-of: radarr-4k + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-4k + helm.sh/chart: radarr-4k-4.5.0 + namespace: radarr-4k spec: + jobLabel: "radarr-4k" + namespaceSelector: + matchNames: + - radarr-4k selector: matchLabels: - app.kubernetes.io/name: radarr-4k app.kubernetes.io/instance: radarr-4k + app.kubernetes.io/name: radarr-4k endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/radarr-anime/Cluster-radarr-anime-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/radarr-anime/Cluster-radarr-anime-postgresql-18-cluster.yaml index 716b65a33..592d0b597 100644 --- a/clusters/cl01tl/manifests/radarr-anime/Cluster-radarr-anime-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/Cluster-radarr-anime-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-anime-postgresql-18-cluster namespace: radarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-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/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..373a11838 --- /dev/null +++ b/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: radarr-anime-postgresql-18-backup-garage-local-secret + namespace: radarr-anime + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-anime-postgresql-18 + app.kubernetes.io/instance: radarr-anime + app.kubernetes.io/part-of: radarr-anime + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index b6b30da6a..000000000 --- a/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: radarr-anime-postgresql-18-cluster-backup-secret - namespace: radarr-anime - labels: - app.kubernetes.io/name: radarr-anime-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: radarr-anime - app.kubernetes.io/part-of: radarr-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/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-recovery-secret.yaml index 19774abc4..b00b94c8d 100644 --- a/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/ExternalSecret-radarr-anime-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-recovery-secret namespace: radarr-anime labels: - app.kubernetes.io/name: radarr-anime-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-anime + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr-anime/HTTPRoute-http-route-radarr-anime.yaml b/clusters/cl01tl/manifests/radarr-anime/HTTPRoute-radarr-anime.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr-anime/HTTPRoute-http-route-radarr-anime.yaml rename to clusters/cl01tl/manifests/radarr-anime/HTTPRoute-radarr-anime.yaml index b2005e327..7240ad221 100644 --- a/clusters/cl01tl/manifests/radarr-anime/HTTPRoute-http-route-radarr-anime.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/HTTPRoute-radarr-anime.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-radarr-anime - namespace: radarr-anime + name: radarr-anime labels: - app.kubernetes.io/name: http-route-radarr-anime app.kubernetes.io/instance: radarr-anime - app.kubernetes.io/part-of: radarr-anime + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-anime + helm.sh/chart: radarr-anime-4.5.0 + namespace: radarr-anime spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - radarr-anime.alexlebens.net + - "radarr-anime.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: radarr-anime + namespace: radarr-anime + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: radarr-anime - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-backup-garage-local.yaml index 2a92ae406..d3703361a 100644 --- a/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "radarr-anime-postgresql-18-garage-local-backup" + name: radarr-anime-postgresql-18-backup-garage-local namespace: radarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-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: radarr-anime-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-anime/radarr-anime-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-recovery.yaml index 913cead3d..f69087797 100644 --- a/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/ObjectStore-radarr-anime-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "radarr-anime-postgresql-18-recovery" namespace: radarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-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: "radarr-anime-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-anime/radarr-anime-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-anime-postgresql-18-cluster-backup-secret-garage + name: radarr-anime-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: radarr-anime-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-anime/PrometheusRule-radarr-anime-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/radarr-anime/PrometheusRule-radarr-anime-postgresql-18-alert-rules.yaml index 7ebdbd0a1..9c2fcd5f7 100644 --- a/clusters/cl01tl/manifests/radarr-anime/PrometheusRule-radarr-anime-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/PrometheusRule-radarr-anime-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-anime-postgresql-18-alert-rules namespace: radarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-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/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-scheduled-backup-live-backup.yaml index 04e75f40e..b805f1bd9 100644 --- a/clusters/cl01tl/manifests/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/ScheduledBackup-radarr-anime-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "radarr-anime-postgresql-18-live-backup-scheduled-backup" + name: "radarr-anime-postgresql-18-scheduled-backup-live-backup" namespace: radarr-anime labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-anime-postgresql-18 app.kubernetes.io/instance: radarr-anime app.kubernetes.io/part-of: radarr-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: "radarr-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: "radarr-anime-postgresql-18-garage-local-backup" + barmanObjectName: "radarr-anime-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/radarr-anime/ServiceMonitor-radarr-anime.yaml b/clusters/cl01tl/manifests/radarr-anime/ServiceMonitor-radarr-anime.yaml index 1aff09208..069b126ce 100644 --- a/clusters/cl01tl/manifests/radarr-anime/ServiceMonitor-radarr-anime.yaml +++ b/clusters/cl01tl/manifests/radarr-anime/ServiceMonitor-radarr-anime.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: radarr-anime - namespace: radarr-anime labels: - app.kubernetes.io/name: radarr-anime app.kubernetes.io/instance: radarr-anime - app.kubernetes.io/part-of: radarr-anime + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-anime + helm.sh/chart: radarr-anime-4.5.0 + namespace: radarr-anime spec: + jobLabel: "radarr-anime" + namespaceSelector: + matchNames: + - radarr-anime selector: matchLabels: - app.kubernetes.io/name: radarr-anime app.kubernetes.io/instance: radarr-anime + app.kubernetes.io/name: radarr-anime endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/radarr-standup/Cluster-radarr-standup-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/radarr-standup/Cluster-radarr-standup-postgresql-18-cluster.yaml index 7dbed4c09..4212fba87 100644 --- a/clusters/cl01tl/manifests/radarr-standup/Cluster-radarr-standup-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/Cluster-radarr-standup-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-standup-postgresql-18-cluster namespace: radarr-standup labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup - 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/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..28804304d --- /dev/null +++ b/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: radarr-standup-postgresql-18-backup-garage-local-secret + namespace: radarr-standup + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-standup-postgresql-18 + app.kubernetes.io/instance: radarr-standup + app.kubernetes.io/part-of: radarr-standup + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-standup-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/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 4a355829d..000000000 --- a/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: radarr-standup-postgresql-18-cluster-backup-secret - namespace: radarr-standup - labels: - app.kubernetes.io/name: radarr-standup-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: radarr-standup - app.kubernetes.io/part-of: radarr-standup -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/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-recovery-secret.yaml similarity index 75% rename from clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-recovery-secret.yaml index 99e948f3e..6f1a083d2 100644 --- a/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/ExternalSecret-radarr-standup-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-recovery-secret namespace: radarr-standup labels: - app.kubernetes.io/name: radarr-standup-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-standup-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/radarr-standup/HTTPRoute-http-route-radarr-standup.yaml b/clusters/cl01tl/manifests/radarr-standup/HTTPRoute-radarr-standup.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr-standup/HTTPRoute-http-route-radarr-standup.yaml rename to clusters/cl01tl/manifests/radarr-standup/HTTPRoute-radarr-standup.yaml index 2cb82cb27..764c50435 100644 --- a/clusters/cl01tl/manifests/radarr-standup/HTTPRoute-http-route-radarr-standup.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/HTTPRoute-radarr-standup.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-radarr-standup - namespace: radarr-standup + name: radarr-standup labels: - app.kubernetes.io/name: http-route-radarr-standup app.kubernetes.io/instance: radarr-standup - app.kubernetes.io/part-of: radarr-standup + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-standup + helm.sh/chart: radarr-standup-4.5.0 + namespace: radarr-standup spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - radarr-standup.alexlebens.net + - "radarr-standup.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: radarr-standup + namespace: radarr-standup + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: radarr-standup - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-backup-garage-local.yaml index 8beae4e5b..f6d25c28b 100644 --- a/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "radarr-standup-postgresql-18-garage-local-backup" + name: radarr-standup-postgresql-18-backup-garage-local namespace: radarr-standup labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-standup-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-standup/radarr-standup-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-recovery.yaml index 26c8cccec..b05da4040 100644 --- a/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/ObjectStore-radarr-standup-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "radarr-standup-postgresql-18-recovery" namespace: radarr-standup labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "radarr-standup-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/radarr-standup/radarr-standup-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-standup-postgresql-18-cluster-backup-secret-garage + name: radarr-standup-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: radarr-standup-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr-standup/PrometheusRule-radarr-standup-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/radarr-standup/PrometheusRule-radarr-standup-postgresql-18-alert-rules.yaml index 39ad7626d..eed377456 100644 --- a/clusters/cl01tl/manifests/radarr-standup/PrometheusRule-radarr-standup-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/PrometheusRule-radarr-standup-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-standup-postgresql-18-alert-rules namespace: radarr-standup labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup - 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/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-scheduled-backup-live-backup.yaml index d2b1fd29a..f02cdbc6f 100644 --- a/clusters/cl01tl/manifests/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/ScheduledBackup-radarr-standup-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "radarr-standup-postgresql-18-live-backup-scheduled-backup" + name: "radarr-standup-postgresql-18-scheduled-backup-live-backup" namespace: radarr-standup labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-standup-postgresql-18 app.kubernetes.io/instance: radarr-standup app.kubernetes.io/part-of: radarr-standup - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "radarr-standup-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: "radarr-standup-postgresql-18-garage-local-backup" + barmanObjectName: "radarr-standup-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/radarr-standup/ServiceMonitor-radarr-standup.yaml b/clusters/cl01tl/manifests/radarr-standup/ServiceMonitor-radarr-standup.yaml index 3bae7b8eb..31fe3a882 100644 --- a/clusters/cl01tl/manifests/radarr-standup/ServiceMonitor-radarr-standup.yaml +++ b/clusters/cl01tl/manifests/radarr-standup/ServiceMonitor-radarr-standup.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: radarr-standup - namespace: radarr-standup labels: - app.kubernetes.io/name: radarr-standup app.kubernetes.io/instance: radarr-standup - app.kubernetes.io/part-of: radarr-standup + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-standup + helm.sh/chart: radarr-standup-4.5.0 + namespace: radarr-standup spec: + jobLabel: "radarr-standup" + namespaceSelector: + matchNames: + - radarr-standup selector: matchLabels: - app.kubernetes.io/name: radarr-standup app.kubernetes.io/instance: radarr-standup + app.kubernetes.io/name: radarr-standup endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/radarr/Cluster-radarr-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/radarr/Cluster-radarr-postgresql-18-cluster.yaml index 1f579bb4c..433466662 100644 --- a/clusters/cl01tl/manifests/radarr/Cluster-radarr-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/radarr/Cluster-radarr-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-postgresql-18-cluster namespace: radarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr - 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/radarr/ExternalSecret-radarr-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..2bc4a4bd5 --- /dev/null +++ b/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: radarr-postgresql-18-backup-garage-local-secret + namespace: radarr + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-postgresql-18 + app.kubernetes.io/instance: radarr + app.kubernetes.io/part-of: radarr + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 8896145bf..000000000 --- a/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: radarr-postgresql-18-cluster-backup-secret - namespace: radarr - labels: - app.kubernetes.io/name: radarr-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: radarr - app.kubernetes.io/part-of: radarr -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/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-recovery-secret.yaml index 026492502..b9c72bff4 100644 --- a/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/radarr/ExternalSecret-radarr-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-recovery-secret namespace: radarr labels: - app.kubernetes.io/name: radarr-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-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/radarr/HTTPRoute-http-route-radarr.yaml b/clusters/cl01tl/manifests/radarr/HTTPRoute-radarr.yaml similarity index 65% rename from clusters/cl01tl/manifests/radarr/HTTPRoute-http-route-radarr.yaml rename to clusters/cl01tl/manifests/radarr/HTTPRoute-radarr.yaml index 1be1844e0..be55b4b5c 100644 --- a/clusters/cl01tl/manifests/radarr/HTTPRoute-http-route-radarr.yaml +++ b/clusters/cl01tl/manifests/radarr/HTTPRoute-radarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-radarr - namespace: radarr + name: radarr labels: - app.kubernetes.io/name: http-route-radarr app.kubernetes.io/instance: radarr - app.kubernetes.io/part-of: radarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr + helm.sh/chart: radarr-4.5.0 + namespace: radarr spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - radarr.alexlebens.net + - "radarr.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: radarr + namespace: radarr + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: radarr - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-backup-garage-local.yaml index 4d1356f99..33617a8be 100644 --- a/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "radarr-postgresql-18-garage-local-backup" + name: radarr-postgresql-18-backup-garage-local namespace: radarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/radarr/radarr-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-recovery.yaml index a5b7d7c1a..787eb25f8 100644 --- a/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/radarr/ObjectStore-radarr-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "radarr-postgresql-18-recovery" namespace: radarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "radarr-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/radarr/radarr-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: radarr-postgresql-18-cluster-backup-secret-garage + name: radarr-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: radarr-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/radarr/PrometheusRule-radarr-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/radarr/PrometheusRule-radarr-postgresql-18-alert-rules.yaml index cbc8f3c5c..824babd99 100644 --- a/clusters/cl01tl/manifests/radarr/PrometheusRule-radarr-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/radarr/PrometheusRule-radarr-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: radarr-postgresql-18-alert-rules namespace: radarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr - 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/radarr/ScheduledBackup-radarr-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/radarr/ScheduledBackup-radarr-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/radarr/ScheduledBackup-radarr-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/radarr/ScheduledBackup-radarr-postgresql-18-scheduled-backup-live-backup.yaml index ab5539a31..08f5b7329 100644 --- a/clusters/cl01tl/manifests/radarr/ScheduledBackup-radarr-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/radarr/ScheduledBackup-radarr-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "radarr-postgresql-18-live-backup-scheduled-backup" + name: "radarr-postgresql-18-scheduled-backup-live-backup" namespace: radarr labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: radarr-postgresql-18 app.kubernetes.io/instance: radarr app.kubernetes.io/part-of: radarr - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "radarr-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: "radarr-postgresql-18-garage-local-backup" + barmanObjectName: "radarr-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/radarr/ServiceMonitor-radarr.yaml b/clusters/cl01tl/manifests/radarr/ServiceMonitor-radarr.yaml index b2b1ce751..dfa59b06d 100644 --- a/clusters/cl01tl/manifests/radarr/ServiceMonitor-radarr.yaml +++ b/clusters/cl01tl/manifests/radarr/ServiceMonitor-radarr.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: radarr - namespace: radarr labels: - app.kubernetes.io/name: radarr app.kubernetes.io/instance: radarr - app.kubernetes.io/part-of: radarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: radarr + helm.sh/chart: radarr-4.5.0 + namespace: radarr spec: + jobLabel: "radarr" + namespaceSelector: + matchNames: + - radarr selector: matchLabels: - app.kubernetes.io/name: radarr app.kubernetes.io/instance: radarr + app.kubernetes.io/name: radarr endpoints: - - port: metrics - interval: 3m - scrapeTimeout: 1m + - interval: 3m path: /metrics + port: metrics + scrapeTimeout: 1m