From 1cba2b7d5ecc0ac4e3a87de60ed93e7926d810f8 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 24 Dec 2025 03:37:06 +0000 Subject: [PATCH] Automated Manifest Update (#2799) This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow. Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/2799 Co-authored-by: gitea-bot Co-committed-by: gitea-bot --- ...aDashboard-grafana-dashboard-jellyfin.yaml | 17 ++++++++ ...uster-jellystat-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...t-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...lystat-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...ellystat.yaml => HTTPRoute-jellystat.yaml} | 26 +++++++------ ...at-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...tore-jellystat-postgresql-18-recovery.yaml | 12 ++++-- ...e-jellystat-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../karakeep/ServiceMonitor-karakeep.yaml | 29 ++++++++------ ...-route-kiwix.yaml => HTTPRoute-kiwix.yaml} | 26 +++++++------ ...ster-komodo-postgresql-17-fdb-cluster.yaml | 4 +- ...sql-17-fdb-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...stgresql-17-fdb-cluster-backup-secret.yaml | 28 ------------- ...do-postgresql-17-fdb-recovery-secret.yaml} | 22 ++++++----- ...oute-komodo.yaml => HTTPRoute-komodo.yaml} | 26 +++++++------ ...ostgresql-17-fdb-backup-garage-local.yaml} | 17 ++++---- ...ore-komodo-postgresql-17-fdb-recovery.yaml | 12 ++++-- ...-komodo-postgresql-17-fdb-alert-rules.yaml | 4 +- ...-17-fdb-scheduled-backup-live-backup.yaml} | 9 +++-- 21 files changed, 231 insertions(+), 161 deletions(-) create mode 100644 clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-jellyfin.yaml create mode 100644 clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/jellystat/{ExternalSecret-jellystat-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-jellystat-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/jellystat/{HTTPRoute-http-route-jellystat.yaml => HTTPRoute-jellystat.yaml} (64%) rename clusters/cl01tl/manifests/jellystat/{ObjectStore-jellystat-postgresql-18-garage-local-backup.yaml => ObjectStore-jellystat-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/jellystat/{ScheduledBackup-jellystat-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-jellystat-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/kiwix/{HTTPRoute-http-route-kiwix.yaml => HTTPRoute-kiwix.yaml} (65%) create mode 100644 clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/komodo/{ExternalSecret-komodo-postgresql-17-cluster-backup-secret-garage.yaml => ExternalSecret-komodo-postgresql-17-fdb-recovery-secret.yaml} (75%) rename clusters/cl01tl/manifests/komodo/{HTTPRoute-https-route-komodo.yaml => HTTPRoute-komodo.yaml} (65%) rename clusters/cl01tl/manifests/komodo/{ObjectStore-komodo-postgresql-17-fdb-garage-local-backup.yaml => ObjectStore-komodo-postgresql-17-fdb-backup-garage-local.yaml} (54%) rename clusters/cl01tl/manifests/komodo/{ScheduledBackup-komodo-postgresql-17-fdb-live-backup-scheduled-backup.yaml => ScheduledBackup-komodo-postgresql-17-fdb-scheduled-backup-live-backup.yaml} (62%) diff --git a/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-jellyfin.yaml b/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-jellyfin.yaml new file mode 100644 index 000000000..3e64d59d1 --- /dev/null +++ b/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-jellyfin.yaml @@ -0,0 +1,17 @@ +apiVersion: grafana.integreatly.org/v1beta1 +kind: GrafanaDashboard +metadata: + name: grafana-dashboard-jellyfin + namespace: grafana-operator + labels: + app.kubernetes.io/name: grafana-dashboard-jellyfin + app.kubernetes.io/instance: grafana-operator + app.kubernetes.io/part-of: grafana-operator +spec: + instanceSelector: + matchLabels: + app: grafana-main + contentCacheDuration: 1h + folderUID: grafana-folder-application + resyncPeriod: 1h + url: http://gitea-http.gitea:3000/alexlebens/grafana-dashboards/raw/branch/main/dashboards/application/jellyfin.json diff --git a/clusters/cl01tl/manifests/jellystat/Cluster-jellystat-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/jellystat/Cluster-jellystat-postgresql-18-cluster.yaml index 0843996f4..bd8554602 100644 --- a/clusters/cl01tl/manifests/jellystat/Cluster-jellystat-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/jellystat/Cluster-jellystat-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: jellystat-postgresql-18-cluster namespace: jellystat labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat - 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/jellystat/ExternalSecret-jellystat-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..6ebeafaa7 --- /dev/null +++ b/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: jellystat-postgresql-18-backup-garage-local-secret + namespace: jellystat + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: jellystat-postgresql-18 + app.kubernetes.io/instance: jellystat + app.kubernetes.io/part-of: jellystat + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: jellystat-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/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 48f1cc7db..000000000 --- a/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: jellystat-postgresql-18-cluster-backup-secret - namespace: jellystat - labels: - app.kubernetes.io/name: jellystat-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: jellystat - app.kubernetes.io/part-of: jellystat -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/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-recovery-secret.yaml index 9f27a8177..b66c447ef 100644 --- a/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/jellystat/ExternalSecret-jellystat-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-recovery-secret namespace: jellystat labels: - app.kubernetes.io/name: jellystat-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: jellystat-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/jellystat/HTTPRoute-http-route-jellystat.yaml b/clusters/cl01tl/manifests/jellystat/HTTPRoute-jellystat.yaml similarity index 64% rename from clusters/cl01tl/manifests/jellystat/HTTPRoute-http-route-jellystat.yaml rename to clusters/cl01tl/manifests/jellystat/HTTPRoute-jellystat.yaml index 7207c44c7..f93890315 100644 --- a/clusters/cl01tl/manifests/jellystat/HTTPRoute-http-route-jellystat.yaml +++ b/clusters/cl01tl/manifests/jellystat/HTTPRoute-jellystat.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-jellystat - namespace: jellystat + name: jellystat labels: - app.kubernetes.io/name: http-route-jellystat app.kubernetes.io/instance: jellystat - app.kubernetes.io/part-of: jellystat + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: jellystat + helm.sh/chart: jellystat-4.5.0 + namespace: jellystat spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - jellystat.alexlebens.net + - "jellystat.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: jellystat + namespace: jellystat + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: jellystat - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-backup-garage-local.yaml index 572619dca..10143675b 100644 --- a/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "jellystat-postgresql-18-garage-local-backup" + name: jellystat-postgresql-18-backup-garage-local namespace: jellystat labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: jellystat-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/jellystat/jellystat-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-recovery.yaml index 17393e168..9af281a96 100644 --- a/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "jellystat-postgresql-18-recovery" namespace: jellystat labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "jellystat-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/jellystat/jellystat-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: jellystat-postgresql-18-cluster-backup-secret-garage + name: jellystat-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: jellystat-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/jellystat/PrometheusRule-jellystat-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/jellystat/PrometheusRule-jellystat-postgresql-18-alert-rules.yaml index c38aca5dc..ead6e2f61 100644 --- a/clusters/cl01tl/manifests/jellystat/PrometheusRule-jellystat-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/jellystat/PrometheusRule-jellystat-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: jellystat-postgresql-18-alert-rules namespace: jellystat labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat - 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/jellystat/ScheduledBackup-jellystat-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-scheduled-backup-live-backup.yaml index 4518679ff..41fcc3193 100644 --- a/clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "jellystat-postgresql-18-live-backup-scheduled-backup" + name: "jellystat-postgresql-18-scheduled-backup-live-backup" namespace: jellystat labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: jellystat-postgresql-18 app.kubernetes.io/instance: jellystat app.kubernetes.io/part-of: jellystat - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "jellystat-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: "jellystat-postgresql-18-garage-local-backup" + barmanObjectName: "jellystat-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep.yaml b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep.yaml index c42f35ec6..9b4dcab36 100644 --- a/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep.yaml +++ b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep.yaml @@ -2,22 +2,27 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: karakeep - namespace: karakeep labels: - app.kubernetes.io/name: karakeep app.kubernetes.io/instance: karakeep - app.kubernetes.io/part-of: karakeep + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: karakeep + helm.sh/chart: karakeep-4.5.0 + namespace: karakeep spec: + jobLabel: "karakeep" + namespaceSelector: + matchNames: + - karakeep + selector: + matchLabels: + app.kubernetes.io/instance: karakeep + app.kubernetes.io/name: karakeep endpoints: - - port: http - interval: 30s - scrapeTimeout: 15s - path: /api/metrics - authorization: + - authorization: credentials: key: prometheus-token name: karakeep-key-secret - selector: - matchLabels: - app.kubernetes.io/name: karakeep - app.kubernetes.io/instance: karakeep + interval: 30s + path: /api/metrics + port: http + scrapeTimeout: 15s diff --git a/clusters/cl01tl/manifests/kiwix/HTTPRoute-http-route-kiwix.yaml b/clusters/cl01tl/manifests/kiwix/HTTPRoute-kiwix.yaml similarity index 65% rename from clusters/cl01tl/manifests/kiwix/HTTPRoute-http-route-kiwix.yaml rename to clusters/cl01tl/manifests/kiwix/HTTPRoute-kiwix.yaml index 93bf161c7..3f8823308 100644 --- a/clusters/cl01tl/manifests/kiwix/HTTPRoute-http-route-kiwix.yaml +++ b/clusters/cl01tl/manifests/kiwix/HTTPRoute-kiwix.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-kiwix - namespace: kiwix + name: kiwix labels: - app.kubernetes.io/name: http-route-kiwix app.kubernetes.io/instance: kiwix - app.kubernetes.io/part-of: kiwix + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kiwix + helm.sh/chart: kiwix-4.5.0 + namespace: kiwix spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - kiwix.alexlebens.net + - "kiwix.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: kiwix + namespace: kiwix + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: kiwix - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml b/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml index 551811dda..257d0c39a 100644 --- a/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml +++ b/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: komodo-postgresql-17-fdb-cluster namespace: komodo labels: - helm.sh/chart: postgresql-17-fdb-cluster-7.1.4 + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo - 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/komodo/ExternalSecret-komodo-postgresql-17-fdb-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-backup-garage-local-secret.yaml new file mode 100644 index 000000000..6ce61fee3 --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: komodo-postgresql-17-fdb-backup-garage-local-secret + namespace: komodo + labels: + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 + app.kubernetes.io/name: komodo-postgresql-17-fdb + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-postgresql-17-fdb-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/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-backup-secret.yaml deleted file mode 100644 index 6afb3e125..000000000 --- a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: komodo-postgresql-17-fdb-cluster-backup-secret - namespace: komodo - labels: - app.kubernetes.io/name: komodo-postgresql-17-fdb-cluster-backup-secret - app.kubernetes.io/instance: komodo - app.kubernetes.io/part-of: komodo -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/komodo/ExternalSecret-komodo-postgresql-17-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-recovery-secret.yaml similarity index 75% rename from clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-recovery-secret.yaml index 3804b721b..f8c4f422c 100644 --- a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-recovery-secret namespace: komodo labels: - app.kubernetes.io/name: komodo-postgresql-17-cluster-backup-secret-garage + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 + app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-postgresql-17-fdb-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/komodo/HTTPRoute-https-route-komodo.yaml b/clusters/cl01tl/manifests/komodo/HTTPRoute-komodo.yaml similarity index 65% rename from clusters/cl01tl/manifests/komodo/HTTPRoute-https-route-komodo.yaml rename to clusters/cl01tl/manifests/komodo/HTTPRoute-komodo.yaml index 748b542dd..17d8330b1 100644 --- a/clusters/cl01tl/manifests/komodo/HTTPRoute-https-route-komodo.yaml +++ b/clusters/cl01tl/manifests/komodo/HTTPRoute-komodo.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: https-route-komodo - namespace: komodo + name: komodo labels: - app.kubernetes.io/name: https-route-komodo app.kubernetes.io/instance: komodo - app.kubernetes.io/part-of: komodo + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo + helm.sh/chart: komodo-4.5.0 + namespace: komodo spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - komodo.alexlebens.net + - "komodo.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: komodo-main + namespace: komodo + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: komodo-main - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-garage-local-backup.yaml b/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-backup-garage-local.yaml similarity index 54% rename from clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-garage-local-backup.yaml rename to clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-backup-garage-local.yaml index d221f066a..19cd9945b 100644 --- a/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "komodo-postgresql-17-fdb-garage-local-backup" + name: komodo-postgresql-17-fdb-backup-garage-local namespace: komodo labels: - helm.sh/chart: postgresql-17-fdb-cluster-7.1.4 + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-postgresql-17-fdb-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: - destinationPath: s3://postgres-backups/cl01tl/komodo/komodo-postgresql-17-cluster + destinationPath: s3://postgres-backups/cl01tl/komodo/komodo-postgresql-17-fdb-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-recovery.yaml b/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-recovery.yaml index 88daa1614..58367431f 100644 --- a/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-recovery.yaml +++ b/clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "komodo-postgresql-17-fdb-recovery" namespace: komodo labels: - helm.sh/chart: postgresql-17-fdb-cluster-7.1.4 + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "komodo-postgresql-17-fdb-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/komodo/komodo-postgresql-17-fdb-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: komodo-postgresql-17-cluster-backup-secret-garage + name: komodo-postgresql-17-fdb-recovery-secret key: ACCESS_SECRET_KEY + region: + name: komodo-postgresql-17-fdb-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/komodo/PrometheusRule-komodo-postgresql-17-fdb-alert-rules.yaml b/clusters/cl01tl/manifests/komodo/PrometheusRule-komodo-postgresql-17-fdb-alert-rules.yaml index 96ceb0031..bf06c7521 100644 --- a/clusters/cl01tl/manifests/komodo/PrometheusRule-komodo-postgresql-17-fdb-alert-rules.yaml +++ b/clusters/cl01tl/manifests/komodo/PrometheusRule-komodo-postgresql-17-fdb-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: komodo-postgresql-17-fdb-alert-rules namespace: komodo labels: - helm.sh/chart: postgresql-17-fdb-cluster-7.1.4 + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo - 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/komodo/ScheduledBackup-komodo-postgresql-17-fdb-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-scheduled-backup-live-backup.yaml similarity index 62% rename from clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-scheduled-backup-live-backup.yaml index ec3ce3637..fae7b59ea 100644 --- a/clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "komodo-postgresql-17-fdb-live-backup-scheduled-backup" + name: "komodo-postgresql-17-fdb-scheduled-backup-live-backup" namespace: komodo labels: - helm.sh/chart: postgresql-17-fdb-cluster-7.1.4 + helm.sh/chart: postgresql-17-fdb-cluster-7.4.3 app.kubernetes.io/name: komodo-postgresql-17-fdb app.kubernetes.io/instance: komodo app.kubernetes.io/part-of: komodo - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "komodo-postgresql-17-fdb-scheduled-backup-live-backup" spec: immediate: true suspend: false @@ -21,4 +22,4 @@ spec: pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "komodo-postgresql-17-fdb-garage-local-backup" + barmanObjectName: "komodo-postgresql-17-fdb-backup-garage-local"