From cdf7554430aef3dd7813e74d9a75b4bf20ca6231 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 24 Dec 2025 05:04:45 +0000 Subject: [PATCH] chore: Update manifests after change --- ...ter-ollama-web-postgresql-18-cluster.yaml} | 16 ++-- ...gresql-18-backup-garage-local-secret.yaml} | 6 +- ...ma-web-postgresql-18-recovery-secret.yaml} | 6 +- ...eb-postgresql-18-backup-garage-local.yaml} | 14 +-- ...re-ollama-web-postgresql-18-recovery.yaml} | 14 +-- ...ollama-web-postgresql-18-alert-rules.yaml} | 86 +++++++++---------- ...esql-18-scheduled-backup-live-backup.yaml} | 10 +-- ...i-tools.yaml => HTTPRoute-omni-tools.yaml} | 26 +++--- ...Cluster-outline-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++ ...e-postgresql-18-cluster-backup-secret.yaml | 28 ------ ...utline-postgresql-18-recovery-secret.yaml} | 22 +++-- ...ObjectBucketClaim-ceph-bucket-outline.yaml | 30 ------- ...ne-postgresql-18-backup-garage-local.yaml} | 15 ++-- ...tStore-outline-postgresql-18-recovery.yaml | 12 ++- ...ule-outline-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +- ...verseerr.yaml => HTTPRoute-overseerr.yaml} | 26 +++--- ...uster-photoview-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++ ...w-postgresql-18-cluster-backup-secret.yaml | 28 ------ ...toview-postgresql-18-recovery-secret.yaml} | 22 +++-- ...hotoview.yaml => HTTPRoute-photoview.yaml} | 26 +++--- ...ew-postgresql-18-backup-garage-local.yaml} | 15 ++-- ...tore-photoview-postgresql-18-recovery.yaml | 12 ++- ...e-photoview-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +- ...tp-route-plex.yaml => HTTPRoute-plex.yaml} | 26 +++--- .../Cluster-postiz-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++ ...z-postgresql-18-cluster-backup-secret.yaml | 28 ------ ...postiz-postgresql-18-recovery-secret.yaml} | 22 +++-- .../manifests/postiz/HTTPRoute-postiz.yaml | 30 +++++++ ...iz-postgresql-18-backup-garage-local.yaml} | 15 ++-- ...ctStore-postiz-postgresql-18-recovery.yaml | 12 ++- ...Rule-postiz-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +- 37 files changed, 393 insertions(+), 322 deletions(-) rename clusters/cl01tl/manifests/ollama/{Cluster-ollama-postgresql-18-cluster.yaml => Cluster-ollama-web-postgresql-18-cluster.yaml} (76%) rename clusters/cl01tl/manifests/ollama/{ExternalSecret-ollama-postgresql-18-backup-garage-local-secret.yaml => ExternalSecret-ollama-web-postgresql-18-backup-garage-local-secret.yaml} (84%) rename clusters/cl01tl/manifests/ollama/{ExternalSecret-ollama-postgresql-18-recovery-secret.yaml => ExternalSecret-ollama-web-postgresql-18-recovery-secret.yaml} (86%) rename clusters/cl01tl/manifests/ollama/{ObjectStore-ollama-postgresql-18-backup-garage-local.yaml => ObjectStore-ollama-web-postgresql-18-backup-garage-local.yaml} (60%) rename clusters/cl01tl/manifests/ollama/{ObjectStore-ollama-postgresql-18-recovery.yaml => ObjectStore-ollama-web-postgresql-18-recovery.yaml} (66%) rename clusters/cl01tl/manifests/ollama/{PrometheusRule-ollama-postgresql-18-alert-rules.yaml => PrometheusRule-ollama-web-postgresql-18-alert-rules.yaml} (74%) rename clusters/cl01tl/manifests/ollama/{ScheduledBackup-ollama-postgresql-18-scheduled-backup-live-backup.yaml => ScheduledBackup-ollama-web-postgresql-18-scheduled-backup-live-backup.yaml} (61%) rename clusters/cl01tl/manifests/omni-tools/{HTTPRoute-http-route-omni-tools.yaml => HTTPRoute-omni-tools.yaml} (64%) create mode 100644 clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/outline/{ExternalSecret-outline-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-outline-postgresql-18-recovery-secret.yaml} (76%) delete mode 100644 clusters/cl01tl/manifests/outline/ObjectBucketClaim-ceph-bucket-outline.yaml rename clusters/cl01tl/manifests/outline/{ObjectStore-outline-postgresql-18-garage-local-backup.yaml => ObjectStore-outline-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/outline/{ScheduledBackup-outline-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-outline-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/overseerr/{HTTPRoute-http-route-overseerr.yaml => HTTPRoute-overseerr.yaml} (64%) create mode 100644 clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/photoview/{ExternalSecret-photoview-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-photoview-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/photoview/{HTTPRoute-http-route-photoview.yaml => HTTPRoute-photoview.yaml} (64%) rename clusters/cl01tl/manifests/photoview/{ObjectStore-photoview-postgresql-18-garage-local-backup.yaml => ObjectStore-photoview-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/photoview/{ScheduledBackup-photoview-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-photoview-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/plex/{HTTPRoute-http-route-plex.yaml => HTTPRoute-plex.yaml} (66%) create mode 100644 clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/postiz/{ExternalSecret-postiz-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-postiz-postgresql-18-recovery-secret.yaml} (76%) create mode 100644 clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml rename clusters/cl01tl/manifests/postiz/{ObjectStore-postiz-postgresql-18-garage-local-backup.yaml => ObjectStore-postiz-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/postiz/{ScheduledBackup-postiz-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-postiz-postgresql-18-scheduled-backup-live-backup.yaml} (63%) diff --git a/clusters/cl01tl/manifests/ollama/Cluster-ollama-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/ollama/Cluster-ollama-web-postgresql-18-cluster.yaml similarity index 76% rename from clusters/cl01tl/manifests/ollama/Cluster-ollama-postgresql-18-cluster.yaml rename to clusters/cl01tl/manifests/ollama/Cluster-ollama-web-postgresql-18-cluster.yaml index 5d8738077..702190599 100644 --- a/clusters/cl01tl/manifests/ollama/Cluster-ollama-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/ollama/Cluster-ollama-web-postgresql-18-cluster.yaml @@ -1,11 +1,11 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: ollama-postgresql-18-cluster + name: ollama-web-postgresql-18-cluster namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" @@ -49,18 +49,18 @@ spec: enabled: true isWALArchiver: true parameters: - barmanObjectName: "ollama-postgresql-18-garage-local-backup" - serverName: "ollama-postgresql-18-backup-1" + barmanObjectName: "ollama-web-postgresql-18-garage-local-backup" + serverName: "ollama-web-postgresql-18-backup-1" bootstrap: recovery: database: app - source: ollama-postgresql-18-backup-1 + source: ollama-web-postgresql-18-backup-1 externalClusters: - - name: ollama-postgresql-18-backup-1 + - name: ollama-web-postgresql-18-backup-1 plugin: name: barman-cloud.cloudnative-pg.io enabled: true isWALArchiver: false parameters: - barmanObjectName: "ollama-postgresql-18-recovery" - serverName: ollama-postgresql-18-backup-1 + barmanObjectName: "ollama-web-postgresql-18-recovery" + serverName: ollama-web-postgresql-18-backup-1 diff --git a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-backup-garage-local-secret.yaml similarity index 84% rename from clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-backup-garage-local-secret.yaml rename to clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-backup-garage-local-secret.yaml index 16f1c09bf..977bb4f35 100644 --- a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-backup-garage-local-secret.yaml +++ b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-backup-garage-local-secret.yaml @@ -1,16 +1,16 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: ollama-postgresql-18-backup-garage-local-secret + name: ollama-web-postgresql-18-backup-garage-local-secret namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ollama-postgresql-18-backup-garage-local-secret + app.kubernetes.io/name: ollama-web-postgresql-18-backup-garage-local-secret spec: secretStoreRef: kind: ClusterSecretStore diff --git a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-recovery-secret.yaml b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-recovery-secret.yaml similarity index 86% rename from clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-recovery-secret.yaml rename to clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-recovery-secret.yaml index b66fd6415..287e562d5 100644 --- a/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-postgresql-18-recovery-secret.yaml +++ b/clusters/cl01tl/manifests/ollama/ExternalSecret-ollama-web-postgresql-18-recovery-secret.yaml @@ -1,16 +1,16 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: ollama-postgresql-18-recovery-secret + name: ollama-web-postgresql-18-recovery-secret namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ollama-postgresql-18-recovery-secret + app.kubernetes.io/name: ollama-web-postgresql-18-recovery-secret spec: secretStoreRef: kind: ClusterSecretStore diff --git a/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-backup-garage-local.yaml b/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-backup-garage-local.yaml similarity index 60% rename from clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-backup-garage-local.yaml rename to clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-backup-garage-local.yaml index 6dfb88a87..d64c813cb 100644 --- a/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-backup-garage-local.yaml +++ b/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-backup-garage-local.yaml @@ -1,28 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: ollama-postgresql-18-backup-garage-local + name: ollama-web-postgresql-18-backup-garage-local namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ollama-postgresql-18-backup-garage-local + app.kubernetes.io/name: ollama-web-postgresql-18-backup-garage-local spec: retentionPolicy: 7d configuration: - destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-postgresql-18-cluster + destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-web-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: ollama-postgresql-18-backup-garage-local-secret + name: ollama-web-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: ollama-postgresql-18-backup-garage-local-secret + name: ollama-web-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: ollama-postgresql-18-backup-garage-local-secret + name: ollama-web-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-recovery.yaml similarity index 66% rename from clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-recovery.yaml rename to clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-recovery.yaml index ddde954ca..4f65cbb6b 100644 --- a/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-recovery.yaml @@ -1,19 +1,19 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "ollama-postgresql-18-recovery" + name: "ollama-web-postgresql-18-recovery" namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: "ollama-postgresql-18-recovery" + app.kubernetes.io/name: "ollama-web-postgresql-18-recovery" spec: configuration: - destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-postgresql-18-cluster + destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-web-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 wal: compression: snappy @@ -23,11 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: ollama-postgresql-18-recovery-secret + name: ollama-web-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: ollama-postgresql-18-recovery-secret + name: ollama-web-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY region: - name: ollama-postgresql-18-recovery-secret + name: ollama-web-postgresql-18-recovery-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-web-postgresql-18-alert-rules.yaml similarity index 74% rename from clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-postgresql-18-alert-rules.yaml rename to clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-web-postgresql-18-alert-rules.yaml index 81f8b7468..bc25c3153 100644 --- a/clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-web-postgresql-18-alert-rules.yaml @@ -1,18 +1,18 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: ollama-postgresql-18-alert-rules + name: ollama-web-postgresql-18-alert-rules namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: groups: - - name: cloudnative-pg/ollama-postgresql-18 + - name: cloudnative-pg/ollama-web-postgresql-18 rules: - alert: CNPGClusterBackendsWaitingWarning annotations: @@ -26,7 +26,7 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterDatabaseDeadlockConflictsWarning annotations: summary: CNPG Cluster has over 10 deadlock conflicts. @@ -39,7 +39,7 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterHACritical annotations: summary: CNPG Cluster has no standby replicas! @@ -62,7 +62,7 @@ spec: labels: severity: critical namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterHAWarning annotations: summary: CNPG Cluster less than 2 standby replicas. @@ -83,67 +83,67 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterHighConnectionsCritical annotations: summary: CNPG Instance maximum number of connections critical! description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" instance {{`{{`}} $labels.pod {{`}}`}} is using {{`{{`}} $value {{`}}`}}% of + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" instance {{`{{`}} $labels.pod {{`}}`}} is using {{`{{`}} $value {{`}}`}}% of the maximum number of connections. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterHighConnectionsCritical.md expr: | - sum by (pod) (cnpg_backends_total{namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) / max by (pod) (cnpg_pg_settings_setting{name="max_connections", namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) * 100 > 95 + sum by (pod) (cnpg_backends_total{namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) / max by (pod) (cnpg_pg_settings_setting{name="max_connections", namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) * 100 > 95 for: 5m labels: severity: critical namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterHighConnectionsWarning annotations: summary: CNPG Instance is approaching the maximum number of connections. description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" instance {{`{{`}} $labels.pod {{`}}`}} is using {{`{{`}} $value {{`}}`}}% of + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" instance {{`{{`}} $labels.pod {{`}}`}} is using {{`{{`}} $value {{`}}`}}% of the maximum number of connections. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterHighConnectionsWarning.md expr: | - sum by (pod) (cnpg_backends_total{namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) / max by (pod) (cnpg_pg_settings_setting{name="max_connections", namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) * 100 > 80 + sum by (pod) (cnpg_backends_total{namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) / max by (pod) (cnpg_pg_settings_setting{name="max_connections", namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) * 100 > 80 for: 5m labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterHighReplicationLag annotations: summary: CNPG Cluster high replication lag description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" is experiencing a high replication lag of + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" is experiencing a high replication lag of {{`{{`}} $value {{`}}`}}ms. High replication lag indicates network issues, busy instances, slow queries or suboptimal configuration. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterHighReplicationLag.md expr: | - max(cnpg_pg_replication_lag{namespace="ollama",pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) * 1000 > 1000 + max(cnpg_pg_replication_lag{namespace="ollama",pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) * 1000 > 1000 for: 5m labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterInstancesOnSameNode annotations: summary: CNPG Cluster instances are located on the same node. description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" has {{`{{`}} $value {{`}}`}} + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" has {{`{{`}} $value {{`}}`}} instances on the same node {{`{{`}} $labels.node {{`}}`}}. A failure or scheduled downtime of a single node will lead to a potential service disruption and/or data loss. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterInstancesOnSameNode.md expr: | - count by (node) (kube_pod_info{namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) > 1 + count by (node) (kube_pod_info{namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) > 1 for: 5m labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterLongRunningTransactionWarning annotations: summary: CNPG Cluster query is taking longer than 5 minutes. @@ -156,65 +156,65 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterLowDiskSpaceCritical annotations: summary: CNPG Instance is running out of disk space! description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" is running extremely low on disk space. Check attached PVCs! + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" is running extremely low on disk space. Check attached PVCs! runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterLowDiskSpaceCritical.md expr: | - max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"})) > 0.9 OR - max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-wal"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-wal"})) > 0.9 OR - max(sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) + max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"})) > 0.9 OR + max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-wal"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-wal"})) > 0.9 OR + max(sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) / - sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) + sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) * on(namespace, persistentvolumeclaim) group_left(volume) - kube_pod_spec_volumes_persistentvolumeclaims_info{pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"} + kube_pod_spec_volumes_persistentvolumeclaims_info{pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"} ) > 0.9 for: 5m labels: severity: critical namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterLowDiskSpaceWarning annotations: summary: CNPG Instance is running out of disk space. description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" is running low on disk space. Check attached PVCs. + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" is running low on disk space. Check attached PVCs. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterLowDiskSpaceWarning.md expr: | - max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"})) > 0.7 OR - max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-wal"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-wal"})) > 0.7 OR - max(sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) + max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"})) > 0.7 OR + max(max by(persistentvolumeclaim) (1 - kubelet_volume_stats_available_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-wal"} / kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-wal"})) > 0.7 OR + max(sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) / - sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) + sum by (namespace,persistentvolumeclaim) (kubelet_volume_stats_capacity_bytes{namespace="ollama", persistentvolumeclaim=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$-tbs.*"}) * on(namespace, persistentvolumeclaim) group_left(volume) - kube_pod_spec_volumes_persistentvolumeclaims_info{pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"} + kube_pod_spec_volumes_persistentvolumeclaims_info{pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"} ) > 0.7 for: 5m labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterOffline annotations: summary: CNPG Cluster has no running instances! description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" has no ready instances. + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" has no ready instances. Having an offline cluster means your applications will not be able to access the database, leading to potential service disruption and/or data loss. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterOffline.md expr: | - (count(cnpg_collector_up{namespace="ollama",pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"}) OR on() vector(0)) == 0 + (count(cnpg_collector_up{namespace="ollama",pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"}) OR on() vector(0)) == 0 for: 5m labels: severity: critical namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterPGDatabaseXidAgeWarning annotations: summary: CNPG Cluster has a number of transactions from the frozen XID to the current one. @@ -227,7 +227,7 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterPGReplicationWarning annotations: summary: CNPG Cluster standby is lagging behind the primary. @@ -239,7 +239,7 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterReplicaFailingReplicationWarning annotations: summary: CNPG Cluster has a replica is failing to replicate. @@ -252,19 +252,19 @@ spec: labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster - alert: CNPGClusterZoneSpreadWarning annotations: summary: CNPG Cluster instances in the same zone. description: |- - CloudNativePG Cluster "ollama/ollama-postgresql-18-cluster" has instances in the same availability zone. + CloudNativePG Cluster "ollama/ollama-web-postgresql-18-cluster" has instances in the same availability zone. A disaster in one availability zone will lead to a potential service disruption and/or data loss. runbook_url: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/docs/runbooks/CNPGClusterZoneSpreadWarning.md expr: | - 3 > count(count by (label_topology_kubernetes_io_zone) (kube_pod_info{namespace="ollama", pod=~"ollama-postgresql-18-cluster-([1-9][0-9]*)$"} * on(node,instance) group_left(label_topology_kubernetes_io_zone) kube_node_labels)) < 3 + 3 > count(count by (label_topology_kubernetes_io_zone) (kube_pod_info{namespace="ollama", pod=~"ollama-web-postgresql-18-cluster-([1-9][0-9]*)$"} * on(node,instance) group_left(label_topology_kubernetes_io_zone) kube_node_labels)) < 3 for: 5m labels: severity: warning namespace: ollama - cnpg_cluster: ollama-postgresql-18-cluster + cnpg_cluster: ollama-web-postgresql-18-cluster diff --git a/clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-postgresql-18-scheduled-backup-live-backup.yaml b/clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-web-postgresql-18-scheduled-backup-live-backup.yaml similarity index 61% rename from clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-postgresql-18-scheduled-backup-live-backup.yaml rename to clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-web-postgresql-18-scheduled-backup-live-backup.yaml index 24e899043..abceea463 100644 --- a/clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-postgresql-18-scheduled-backup-live-backup.yaml +++ b/clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-web-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,25 +1,25 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "ollama-postgresql-18-scheduled-backup-live-backup" + name: "ollama-web-postgresql-18-scheduled-backup-live-backup" namespace: ollama labels: helm.sh/chart: postgres-18-cluster-7.4.3 - app.kubernetes.io/name: ollama-postgresql-18 + app.kubernetes.io/name: ollama-web-postgresql-18 app.kubernetes.io/instance: ollama app.kubernetes.io/part-of: ollama app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: "ollama-postgresql-18-scheduled-backup-live-backup" + app.kubernetes.io/name: "ollama-web-postgresql-18-scheduled-backup-live-backup" spec: immediate: true suspend: false schedule: "0 0 0 * * *" backupOwnerReference: self cluster: - name: ollama-postgresql-18-cluster + name: ollama-web-postgresql-18-cluster method: plugin pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "ollama-postgresql-18-backup-garage-local" + barmanObjectName: "ollama-web-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/omni-tools/HTTPRoute-http-route-omni-tools.yaml b/clusters/cl01tl/manifests/omni-tools/HTTPRoute-omni-tools.yaml similarity index 64% rename from clusters/cl01tl/manifests/omni-tools/HTTPRoute-http-route-omni-tools.yaml rename to clusters/cl01tl/manifests/omni-tools/HTTPRoute-omni-tools.yaml index 495b84562..8949587de 100644 --- a/clusters/cl01tl/manifests/omni-tools/HTTPRoute-http-route-omni-tools.yaml +++ b/clusters/cl01tl/manifests/omni-tools/HTTPRoute-omni-tools.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-omni-tools - namespace: omni-tools + name: omni-tools labels: - app.kubernetes.io/name: http-route-omni-tools app.kubernetes.io/instance: omni-tools - app.kubernetes.io/part-of: omni-tools + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: omni-tools + helm.sh/chart: omni-tools-4.5.0 + namespace: omni-tools spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - omni-tools.alexlebens.net + - "omni-tools.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: omni-tools + namespace: omni-tools + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: omni-tools - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml index f1c9ad031..a288a999c 100644 --- a/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: outline-postgresql-18-cluster namespace: outline labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - 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/outline/ExternalSecret-outline-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..65d15f5a6 --- /dev/null +++ b/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: outline-postgresql-18-backup-garage-local-secret + namespace: outline + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: outline-postgresql-18 + app.kubernetes.io/instance: outline + app.kubernetes.io/part-of: outline + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: outline-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/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 823f9d233..000000000 --- a/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: outline-postgresql-18-cluster-backup-secret - namespace: outline - labels: - app.kubernetes.io/name: outline-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: outline - app.kubernetes.io/part-of: outline -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/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-recovery-secret.yaml index 179121f9f..00b3a87d6 100644 --- a/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/outline/ExternalSecret-outline-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-recovery-secret namespace: outline labels: - app.kubernetes.io/name: outline-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: outline-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/outline/ObjectBucketClaim-ceph-bucket-outline.yaml b/clusters/cl01tl/manifests/outline/ObjectBucketClaim-ceph-bucket-outline.yaml deleted file mode 100644 index a7fd7e473..000000000 --- a/clusters/cl01tl/manifests/outline/ObjectBucketClaim-ceph-bucket-outline.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: objectbucket.io/v1alpha1 -kind: ObjectBucketClaim -metadata: - name: ceph-bucket-outline - labels: - app.kubernetes.io/name: ceph-bucket-outline - app.kubernetes.io/instance: outline - app.kubernetes.io/part-of: outline -spec: - generateBucketName: bucket-outline - storageClassName: ceph-bucket - additionalConfig: - bucketPolicy: | - { - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "VisualEditor", - "Effect": "Allow", - "Action": [ - "s3:GetObjectAcl", - "s3:DeleteObject", - "s3:PutObject", - "s3:GetObject", - "s3:PutObjectAcl" - ], - "Resource": "arn:aws:s3:::bucket-outline-630c57e0-d475-4d78-926c-c1c082291d73/*" - } - ] - } diff --git a/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-backup-garage-local.yaml index 93a763e71..809256963 100644 --- a/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "outline-postgresql-18-garage-local-backup" + name: outline-postgresql-18-backup-garage-local namespace: outline labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: outline-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml index 443c7723c..b261270f9 100644 --- a/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "outline-postgresql-18-recovery" namespace: outline labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "outline-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: outline-postgresql-18-cluster-backup-secret-garage + name: outline-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: outline-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/outline/PrometheusRule-outline-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/outline/PrometheusRule-outline-postgresql-18-alert-rules.yaml index 07a5ce2b7..936b87ba9 100644 --- a/clusters/cl01tl/manifests/outline/PrometheusRule-outline-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/outline/PrometheusRule-outline-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: outline-postgresql-18-alert-rules namespace: outline labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - 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/outline/ScheduledBackup-outline-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-scheduled-backup-live-backup.yaml index 9dde7d000..a4e0ee191 100644 --- a/clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "outline-postgresql-18-live-backup-scheduled-backup" + name: "outline-postgresql-18-scheduled-backup-live-backup" namespace: outline labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: outline-postgresql-18 app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "outline-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: "outline-postgresql-18-garage-local-backup" + barmanObjectName: "outline-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/overseerr/HTTPRoute-http-route-overseerr.yaml b/clusters/cl01tl/manifests/overseerr/HTTPRoute-overseerr.yaml similarity index 64% rename from clusters/cl01tl/manifests/overseerr/HTTPRoute-http-route-overseerr.yaml rename to clusters/cl01tl/manifests/overseerr/HTTPRoute-overseerr.yaml index 03a12e657..b79da7e59 100644 --- a/clusters/cl01tl/manifests/overseerr/HTTPRoute-http-route-overseerr.yaml +++ b/clusters/cl01tl/manifests/overseerr/HTTPRoute-overseerr.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-overseerr - namespace: overseerr + name: overseerr labels: - app.kubernetes.io/name: http-route-overseerr app.kubernetes.io/instance: overseerr - app.kubernetes.io/part-of: overseerr + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: overseerr + helm.sh/chart: app-template-4.5.0 + namespace: overseerr spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - overseerr.alexlebens.net + - "overseerr.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: overseerr + namespace: overseerr + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: overseerr - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/photoview/Cluster-photoview-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/photoview/Cluster-photoview-postgresql-18-cluster.yaml index ccbc00163..c396a93c6 100644 --- a/clusters/cl01tl/manifests/photoview/Cluster-photoview-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/photoview/Cluster-photoview-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: photoview-postgresql-18-cluster namespace: photoview labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview - 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/photoview/ExternalSecret-photoview-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..30675a76f --- /dev/null +++ b/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: photoview-postgresql-18-backup-garage-local-secret + namespace: photoview + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: photoview-postgresql-18 + app.kubernetes.io/instance: photoview + app.kubernetes.io/part-of: photoview + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: photoview-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/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 3a060a704..000000000 --- a/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: photoview-postgresql-18-cluster-backup-secret - namespace: photoview - labels: - app.kubernetes.io/name: photoview-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: photoview - app.kubernetes.io/part-of: photoview -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/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-recovery-secret.yaml index 397362016..2a86bc264 100644 --- a/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/photoview/ExternalSecret-photoview-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-recovery-secret namespace: photoview labels: - app.kubernetes.io/name: photoview-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: photoview-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/photoview/HTTPRoute-http-route-photoview.yaml b/clusters/cl01tl/manifests/photoview/HTTPRoute-photoview.yaml similarity index 64% rename from clusters/cl01tl/manifests/photoview/HTTPRoute-http-route-photoview.yaml rename to clusters/cl01tl/manifests/photoview/HTTPRoute-photoview.yaml index d5536fa51..83e8bee3f 100644 --- a/clusters/cl01tl/manifests/photoview/HTTPRoute-http-route-photoview.yaml +++ b/clusters/cl01tl/manifests/photoview/HTTPRoute-photoview.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-photoview - namespace: photoview + name: photoview labels: - app.kubernetes.io/name: http-route-photoview app.kubernetes.io/instance: photoview - app.kubernetes.io/part-of: photoview + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: photoview + helm.sh/chart: photoview-4.5.0 + namespace: photoview spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - photoview.alexlebens.net + - "photoview.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: photoview + namespace: photoview + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: photoview - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-backup-garage-local.yaml index 4f855b0bd..eda275a25 100644 --- a/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "photoview-postgresql-18-garage-local-backup" + name: photoview-postgresql-18-backup-garage-local namespace: photoview labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: photoview-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/photoview/photoview-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-recovery.yaml index 82cb0277c..7853fe1a3 100644 --- a/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "photoview-postgresql-18-recovery" namespace: photoview labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "photoview-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/photoview/photoview-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: photoview-postgresql-18-cluster-backup-secret-garage + name: photoview-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: photoview-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/photoview/PrometheusRule-photoview-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/photoview/PrometheusRule-photoview-postgresql-18-alert-rules.yaml index 39d9ebbe9..c4d810c5c 100644 --- a/clusters/cl01tl/manifests/photoview/PrometheusRule-photoview-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/photoview/PrometheusRule-photoview-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: photoview-postgresql-18-alert-rules namespace: photoview labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview - 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/photoview/ScheduledBackup-photoview-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/photoview/ScheduledBackup-photoview-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/photoview/ScheduledBackup-photoview-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/photoview/ScheduledBackup-photoview-postgresql-18-scheduled-backup-live-backup.yaml index 2fc953d78..a1032523d 100644 --- a/clusters/cl01tl/manifests/photoview/ScheduledBackup-photoview-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/photoview/ScheduledBackup-photoview-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "photoview-postgresql-18-live-backup-scheduled-backup" + name: "photoview-postgresql-18-scheduled-backup-live-backup" namespace: photoview labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: photoview-postgresql-18 app.kubernetes.io/instance: photoview app.kubernetes.io/part-of: photoview - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "photoview-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: "photoview-postgresql-18-garage-local-backup" + barmanObjectName: "photoview-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/plex/HTTPRoute-http-route-plex.yaml b/clusters/cl01tl/manifests/plex/HTTPRoute-plex.yaml similarity index 66% rename from clusters/cl01tl/manifests/plex/HTTPRoute-http-route-plex.yaml rename to clusters/cl01tl/manifests/plex/HTTPRoute-plex.yaml index dfe8d2436..5a3e743b1 100644 --- a/clusters/cl01tl/manifests/plex/HTTPRoute-http-route-plex.yaml +++ b/clusters/cl01tl/manifests/plex/HTTPRoute-plex.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-plex - namespace: plex + name: plex labels: - app.kubernetes.io/name: http-route-plex app.kubernetes.io/instance: plex - app.kubernetes.io/part-of: plex + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: plex + helm.sh/chart: plex-4.5.0 + namespace: plex spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - plex.alexlebens.net + - "plex.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: plex + namespace: plex + port: 32400 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: plex - port: 32400 - weight: 100 diff --git a/clusters/cl01tl/manifests/postiz/Cluster-postiz-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/postiz/Cluster-postiz-postgresql-18-cluster.yaml index 748b41646..dc17055b1 100644 --- a/clusters/cl01tl/manifests/postiz/Cluster-postiz-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/postiz/Cluster-postiz-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: postiz-postgresql-18-cluster namespace: postiz labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - 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/postiz/ExternalSecret-postiz-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..747e1308b --- /dev/null +++ b/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: postiz-postgresql-18-backup-garage-local-secret + namespace: postiz + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: postiz-postgresql-18 + app.kubernetes.io/instance: postiz + app.kubernetes.io/part-of: postiz + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postiz-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/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index d353cec8a..000000000 --- a/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: postiz-postgresql-18-cluster-backup-secret - namespace: postiz - labels: - app.kubernetes.io/name: postiz-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: postiz - app.kubernetes.io/part-of: postiz -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/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-recovery-secret.yaml index efd4aed35..ed8514817 100644 --- a/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/postiz/ExternalSecret-postiz-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-recovery-secret namespace: postiz labels: - app.kubernetes.io/name: postiz-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postiz-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/postiz/HTTPRoute-postiz.yaml b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml new file mode 100644 index 000000000..425460e3a --- /dev/null +++ b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml @@ -0,0 +1,30 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: postiz + labels: + app.kubernetes.io/instance: postiz + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postiz + helm.sh/chart: postiz-4.5.0 + namespace: postiz +spec: + parentRefs: + - group: gateway.networking.k8s.io + kind: Gateway + name: traefik-gateway + namespace: traefik + hostnames: + - "postiz.alexlebens.net" + rules: + - backendRefs: + - group: "" + kind: Service + name: postiz + namespace: postiz + port: 80 + weight: 100 + matches: + - path: + type: PathPrefix + value: / diff --git a/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-backup-garage-local.yaml index 5f1427215..54a50890b 100644 --- a/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "postiz-postgresql-18-garage-local-backup" + name: postiz-postgresql-18-backup-garage-local namespace: postiz labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postiz-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/postiz/postiz-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-recovery.yaml index 209011f3c..515533604 100644 --- a/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/postiz/ObjectStore-postiz-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "postiz-postgresql-18-recovery" namespace: postiz labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "postiz-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/postiz/postiz-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: postiz-postgresql-18-cluster-backup-secret-garage + name: postiz-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: postiz-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/postiz/PrometheusRule-postiz-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/postiz/PrometheusRule-postiz-postgresql-18-alert-rules.yaml index 2114c8fb0..1e4583d02 100644 --- a/clusters/cl01tl/manifests/postiz/PrometheusRule-postiz-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/postiz/PrometheusRule-postiz-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: postiz-postgresql-18-alert-rules namespace: postiz labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - 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/postiz/ScheduledBackup-postiz-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/postiz/ScheduledBackup-postiz-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/postiz/ScheduledBackup-postiz-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/postiz/ScheduledBackup-postiz-postgresql-18-scheduled-backup-live-backup.yaml index d19261b84..381fc1b6b 100644 --- a/clusters/cl01tl/manifests/postiz/ScheduledBackup-postiz-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/postiz/ScheduledBackup-postiz-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "postiz-postgresql-18-live-backup-scheduled-backup" + name: "postiz-postgresql-18-scheduled-backup-live-backup" namespace: postiz labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: postiz-postgresql-18 app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "postiz-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: "postiz-postgresql-18-garage-local-backup" + barmanObjectName: "postiz-postgresql-18-backup-garage-local"