diff --git a/clusters/cl01tl/manifests/stalwart/Cluster-stalwart-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/stalwart/Cluster-stalwart-postgresql-18-cluster.yaml index fac774eed..103c9ebe5 100644 --- a/clusters/cl01tl/manifests/stalwart/Cluster-stalwart-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/stalwart/Cluster-stalwart-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: stalwart-postgresql-18-cluster namespace: stalwart labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - 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/stalwart/ExternalSecret-stalwart-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..9cd94f085 --- /dev/null +++ b/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: stalwart-postgresql-18-backup-garage-local-secret + namespace: stalwart + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: stalwart-postgresql-18 + app.kubernetes.io/instance: stalwart + app.kubernetes.io/part-of: stalwart + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: stalwart-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/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 94ab0670b..000000000 --- a/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: stalwart-postgresql-18-cluster-backup-secret - namespace: stalwart - labels: - app.kubernetes.io/name: stalwart-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: stalwart - app.kubernetes.io/version: v0.14.1 - app.kubernetes.io/component: database - app.kubernetes.io/part-of: stalwart -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/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-recovery-secret.yaml index 8a5461847..8ed26fdc7 100644 --- a/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/stalwart/ExternalSecret-stalwart-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-recovery-secret namespace: stalwart labels: - app.kubernetes.io/name: stalwart-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: stalwart-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/stalwart/HTTPRoute-http-route-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/HTTPRoute-stalwart.yaml similarity index 64% rename from clusters/cl01tl/manifests/stalwart/HTTPRoute-http-route-stalwart.yaml rename to clusters/cl01tl/manifests/stalwart/HTTPRoute-stalwart.yaml index 9d684c633..6d7d6d204 100644 --- a/clusters/cl01tl/manifests/stalwart/HTTPRoute-http-route-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/HTTPRoute-stalwart.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-stalwart - namespace: stalwart + name: stalwart labels: - app.kubernetes.io/name: http-route-stalwart app.kubernetes.io/instance: stalwart - app.kubernetes.io/part-of: stalwart + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: stalwart + helm.sh/chart: stalwart-4.5.0 + namespace: stalwart spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - stalwart.alexlebens.net + - "stalwart.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: stalwart + namespace: stalwart + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: stalwart - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-backup-garage-local.yaml index b07b3c437..a4ab46fde 100644 --- a/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "stalwart-postgresql-18-garage-local-backup" + name: stalwart-postgresql-18-backup-garage-local namespace: stalwart labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: stalwart-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-recovery.yaml index 9862184c8..8c4a57ef0 100644 --- a/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/stalwart/ObjectStore-stalwart-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "stalwart-postgresql-18-recovery" namespace: stalwart labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "stalwart-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: stalwart-postgresql-18-cluster-backup-secret-garage + name: stalwart-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: stalwart-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/stalwart/PrometheusRule-stalwart-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/stalwart/PrometheusRule-stalwart-postgresql-18-alert-rules.yaml index 14b0b000d..1572a431c 100644 --- a/clusters/cl01tl/manifests/stalwart/PrometheusRule-stalwart-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/stalwart/PrometheusRule-stalwart-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: stalwart-postgresql-18-alert-rules namespace: stalwart labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - 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/stalwart/ScheduledBackup-stalwart-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/stalwart/ScheduledBackup-stalwart-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/stalwart/ScheduledBackup-stalwart-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/stalwart/ScheduledBackup-stalwart-postgresql-18-scheduled-backup-live-backup.yaml index 8254f7759..48c230763 100644 --- a/clusters/cl01tl/manifests/stalwart/ScheduledBackup-stalwart-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/stalwart/ScheduledBackup-stalwart-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "stalwart-postgresql-18-live-backup-scheduled-backup" + name: "stalwart-postgresql-18-scheduled-backup-live-backup" namespace: stalwart labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: stalwart-postgresql-18 app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "stalwart-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: "stalwart-postgresql-18-garage-local-backup" + barmanObjectName: "stalwart-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/tautulli/HTTPRoute-http-route-tautulli.yaml b/clusters/cl01tl/manifests/tautulli/HTTPRoute-tautulli.yaml similarity index 64% rename from clusters/cl01tl/manifests/tautulli/HTTPRoute-http-route-tautulli.yaml rename to clusters/cl01tl/manifests/tautulli/HTTPRoute-tautulli.yaml index a6395ac2f..40e81d814 100644 --- a/clusters/cl01tl/manifests/tautulli/HTTPRoute-http-route-tautulli.yaml +++ b/clusters/cl01tl/manifests/tautulli/HTTPRoute-tautulli.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-tautulli - namespace: tautulli + name: tautulli labels: - app.kubernetes.io/name: http-route-tautulli app.kubernetes.io/instance: tautulli - app.kubernetes.io/part-of: tautulli + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: tautulli + helm.sh/chart: tautulli-4.5.0 + namespace: tautulli spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - tautulli.alexlebens.net + - "tautulli.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: tautulli + namespace: tautulli + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: tautulli - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/tdarr/HTTPRoute-http-route-tdarr.yaml b/clusters/cl01tl/manifests/tdarr/HTTPRoute-tdarr.yaml similarity index 66% rename from clusters/cl01tl/manifests/tdarr/HTTPRoute-http-route-tdarr.yaml rename to clusters/cl01tl/manifests/tdarr/HTTPRoute-tdarr.yaml index a99495b17..3a09d22e5 100644 --- a/clusters/cl01tl/manifests/tdarr/HTTPRoute-http-route-tdarr.yaml +++ b/clusters/cl01tl/manifests/tdarr/HTTPRoute-tdarr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-tdarr - namespace: tdarr + name: tdarr labels: - app.kubernetes.io/name: http-route-tdarr app.kubernetes.io/instance: tdarr - app.kubernetes.io/part-of: tdarr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: tdarr + helm.sh/chart: tdarr-4.5.0 + namespace: tdarr spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - tdarr.alexlebens.net + - "tdarr.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: tdarr-web + namespace: tdarr + port: 8265 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: tdarr-web - port: 8265 - weight: 100 diff --git a/clusters/cl01tl/manifests/tubearchivist/HTTPRoute-http-route-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/HTTPRoute-tubearchivist.yaml similarity index 63% rename from clusters/cl01tl/manifests/tubearchivist/HTTPRoute-http-route-tubearchivist.yaml rename to clusters/cl01tl/manifests/tubearchivist/HTTPRoute-tubearchivist.yaml index 76e9f3774..323ac2383 100644 --- a/clusters/cl01tl/manifests/tubearchivist/HTTPRoute-http-route-tubearchivist.yaml +++ b/clusters/cl01tl/manifests/tubearchivist/HTTPRoute-tubearchivist.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-tubearchivist - namespace: tubearchivist + name: tubearchivist labels: - app.kubernetes.io/name: http-route-tubearchivist app.kubernetes.io/instance: tubearchivist - app.kubernetes.io/part-of: tubearchivist + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: tubearchivist + helm.sh/chart: tubearchivist-4.5.0 + namespace: tubearchivist spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - tubearchivist.alexlebens.net + - "tubearchivist.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: tubearchivist + namespace: tubearchivist + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: tubearchivist - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/unpoller/ServiceMonitor-unpoller.yaml b/clusters/cl01tl/manifests/unpoller/ServiceMonitor-unpoller.yaml index ada8fae1a..57a99abc7 100644 --- a/clusters/cl01tl/manifests/unpoller/ServiceMonitor-unpoller.yaml +++ b/clusters/cl01tl/manifests/unpoller/ServiceMonitor-unpoller.yaml @@ -2,18 +2,23 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: unpoller - namespace: unpoller labels: - app.kubernetes.io/name: unpoller app.kubernetes.io/instance: unpoller - app.kubernetes.io/part-of: unpoller + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: unpoller + helm.sh/chart: unpoller-4.5.0 + namespace: unpoller spec: + jobLabel: "unpoller" + namespaceSelector: + matchNames: + - unpoller selector: matchLabels: - app.kubernetes.io/name: unpoller app.kubernetes.io/instance: unpoller + app.kubernetes.io/name: unpoller endpoints: - - port: metrics - interval: 30s - scrapeTimeout: 10s + - interval: 30s path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/vault/HTTPRoute-http-route-vault.yaml b/clusters/cl01tl/manifests/vault/HTTPRoute-vault.yaml similarity index 89% rename from clusters/cl01tl/manifests/vault/HTTPRoute-http-route-vault.yaml rename to clusters/cl01tl/manifests/vault/HTTPRoute-vault.yaml index 5a84dd3d4..ce0fad322 100644 --- a/clusters/cl01tl/manifests/vault/HTTPRoute-http-route-vault.yaml +++ b/clusters/cl01tl/manifests/vault/HTTPRoute-vault.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-vault + name: vault namespace: vault labels: - app.kubernetes.io/name: http-route-vault + app.kubernetes.io/name: vault app.kubernetes.io/instance: vault app.kubernetes.io/part-of: vault spec: diff --git a/clusters/cl01tl/manifests/vaultwarden/Cluster-vaultwarden-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/vaultwarden/Cluster-vaultwarden-postgresql-18-cluster.yaml index 2cbf8c53b..2d3f87c04 100644 --- a/clusters/cl01tl/manifests/vaultwarden/Cluster-vaultwarden-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/Cluster-vaultwarden-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: vaultwarden-postgresql-18-cluster namespace: vaultwarden labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden - 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/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..7b7ec45ab --- /dev/null +++ b/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: vaultwarden-postgresql-18-backup-garage-local-secret + namespace: vaultwarden + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: vaultwarden-postgresql-18 + app.kubernetes.io/instance: vaultwarden + app.kubernetes.io/part-of: vaultwarden + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: vaultwarden-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/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index b79e44aac..000000000 --- a/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: vaultwarden-postgresql-18-cluster-backup-secret - namespace: vaultwarden - labels: - app.kubernetes.io/name: vaultwarden-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: vaultwarden - app.kubernetes.io/part-of: vaultwarden -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/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-recovery-secret.yaml index 8444f06fa..8ecea628d 100644 --- a/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/ExternalSecret-vaultwarden-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-recovery-secret namespace: vaultwarden labels: - app.kubernetes.io/name: vaultwarden-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: vaultwarden-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/vaultwarden/ObjectStore-vaultwarden-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-backup-garage-local.yaml index 51f9cb380..5d8cfdd6a 100644 --- a/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "vaultwarden-postgresql-18-garage-local-backup" + name: vaultwarden-postgresql-18-backup-garage-local namespace: vaultwarden labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: vaultwarden-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/vaultwarden/vaultwarden-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-recovery.yaml index 413da7c9d..f13bf7a70 100644 --- a/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/ObjectStore-vaultwarden-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "vaultwarden-postgresql-18-recovery" namespace: vaultwarden labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "vaultwarden-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/vaultwarden/vaultwarden-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: vaultwarden-postgresql-18-cluster-backup-secret-garage + name: vaultwarden-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: vaultwarden-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/vaultwarden/PrometheusRule-vaultwarden-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/vaultwarden/PrometheusRule-vaultwarden-postgresql-18-alert-rules.yaml index c4e932d46..7905de8b3 100644 --- a/clusters/cl01tl/manifests/vaultwarden/PrometheusRule-vaultwarden-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/PrometheusRule-vaultwarden-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: vaultwarden-postgresql-18-alert-rules namespace: vaultwarden labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden - 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/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-scheduled-backup-live-backup.yaml index 789663de5..175d5926c 100644 --- a/clusters/cl01tl/manifests/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/vaultwarden/ScheduledBackup-vaultwarden-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "vaultwarden-postgresql-18-live-backup-scheduled-backup" + name: "vaultwarden-postgresql-18-scheduled-backup-live-backup" namespace: vaultwarden labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: vaultwarden-postgresql-18 app.kubernetes.io/instance: vaultwarden app.kubernetes.io/part-of: vaultwarden - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "vaultwarden-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: "vaultwarden-postgresql-18-garage-local-backup" + barmanObjectName: "vaultwarden-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/whodb/HTTPRoute-http-route-whodb.yaml b/clusters/cl01tl/manifests/whodb/HTTPRoute-whodb.yaml similarity index 65% rename from clusters/cl01tl/manifests/whodb/HTTPRoute-http-route-whodb.yaml rename to clusters/cl01tl/manifests/whodb/HTTPRoute-whodb.yaml index 55ecb1b7f..1718d19f5 100644 --- a/clusters/cl01tl/manifests/whodb/HTTPRoute-http-route-whodb.yaml +++ b/clusters/cl01tl/manifests/whodb/HTTPRoute-whodb.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-whodb - namespace: whodb + name: whodb labels: - app.kubernetes.io/name: http-route-whodb app.kubernetes.io/instance: whodb - app.kubernetes.io/part-of: whodb + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: whodb + helm.sh/chart: whodb-4.5.0 + namespace: whodb spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - whodb.alexlebens.net + - "whodb.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: whodb + namespace: whodb + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: whodb - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/yamtrack/Cluster-yamtrack-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/yamtrack/Cluster-yamtrack-postgresql-18-cluster.yaml index cee3720a7..6e6910b86 100644 --- a/clusters/cl01tl/manifests/yamtrack/Cluster-yamtrack-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/yamtrack/Cluster-yamtrack-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: yamtrack-postgresql-18-cluster namespace: yamtrack labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - 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/yamtrack/ExternalSecret-yamtrack-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..c507bdecf --- /dev/null +++ b/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: yamtrack-postgresql-18-backup-garage-local-secret + namespace: yamtrack + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: yamtrack-postgresql-18 + app.kubernetes.io/instance: yamtrack + app.kubernetes.io/part-of: yamtrack + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: yamtrack-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/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 449e3ce81..000000000 --- a/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: yamtrack-postgresql-18-cluster-backup-secret - namespace: yamtrack - labels: - app.kubernetes.io/name: yamtrack-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: yamtrack - app.kubernetes.io/part-of: yamtrack -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/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-recovery-secret.yaml index 1be3e05c9..4389a207c 100644 --- a/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ExternalSecret-yamtrack-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-recovery-secret namespace: yamtrack labels: - app.kubernetes.io/name: yamtrack-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: yamtrack-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/yamtrack/HTTPRoute-http-route-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/HTTPRoute-yamtrack.yaml similarity index 64% rename from clusters/cl01tl/manifests/yamtrack/HTTPRoute-http-route-yamtrack.yaml rename to clusters/cl01tl/manifests/yamtrack/HTTPRoute-yamtrack.yaml index 10060d0a9..a2d166a02 100644 --- a/clusters/cl01tl/manifests/yamtrack/HTTPRoute-http-route-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/HTTPRoute-yamtrack.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-yamtrack - namespace: yamtrack + name: yamtrack labels: - app.kubernetes.io/name: http-route-yamtrack app.kubernetes.io/instance: yamtrack - app.kubernetes.io/part-of: yamtrack + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: yamtrack + helm.sh/chart: yamtrack-4.5.0 + namespace: yamtrack spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - yamtrack.alexlebens.net + - "yamtrack.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: yamtrack + namespace: yamtrack + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: yamtrack - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-backup-garage-local.yaml index 2f80c0cea..1e123dc66 100644 --- a/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "yamtrack-postgresql-18-garage-local-backup" + name: yamtrack-postgresql-18-backup-garage-local namespace: yamtrack labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: yamtrack-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/yamtrack/yamtrack-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-recovery.yaml index dee686a9a..5230b46fd 100644 --- a/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ObjectStore-yamtrack-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "yamtrack-postgresql-18-recovery" namespace: yamtrack labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "yamtrack-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/yamtrack/yamtrack-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: yamtrack-postgresql-18-cluster-backup-secret-garage + name: yamtrack-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: yamtrack-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/yamtrack/PrometheusRule-yamtrack-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/yamtrack/PrometheusRule-yamtrack-postgresql-18-alert-rules.yaml index 5195976ad..e669d0698 100644 --- a/clusters/cl01tl/manifests/yamtrack/PrometheusRule-yamtrack-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/yamtrack/PrometheusRule-yamtrack-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: yamtrack-postgresql-18-alert-rules namespace: yamtrack labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - 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/yamtrack/ScheduledBackup-yamtrack-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/yamtrack/ScheduledBackup-yamtrack-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/yamtrack/ScheduledBackup-yamtrack-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/yamtrack/ScheduledBackup-yamtrack-postgresql-18-scheduled-backup-live-backup.yaml index b34556561..871a35414 100644 --- a/clusters/cl01tl/manifests/yamtrack/ScheduledBackup-yamtrack-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ScheduledBackup-yamtrack-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "yamtrack-postgresql-18-live-backup-scheduled-backup" + name: "yamtrack-postgresql-18-scheduled-backup-live-backup" namespace: yamtrack labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: yamtrack-postgresql-18 app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "yamtrack-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: "yamtrack-postgresql-18-garage-local-backup" + barmanObjectName: "yamtrack-postgresql-18-backup-garage-local"