diff --git a/clusters/cl01tl/helm/grafana-operator/Chart.lock b/clusters/cl01tl/helm/grafana-operator/Chart.lock index f79241615..f5a95e08e 100644 --- a/clusters/cl01tl/helm/grafana-operator/Chart.lock +++ b/clusters/cl01tl/helm/grafana-operator/Chart.lock @@ -5,8 +5,5 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -- name: postgres-cluster - repository: oci://harbor.alexlebens.net/helm-charts - version: 6.16.1 -digest: sha256:7e72ff7c4556d76fab5e4c4e4af5db9e81f62336a65f247acd05c8e29372373b -generated: "2025-12-11T17:49:21.92202-06:00" +digest: sha256:9640766b4a15b50a759edbc8a2aad816f9240be72bf06364acb387464245d51a +generated: "2025-12-11T19:19:12.375716-06:00" diff --git a/clusters/cl01tl/helm/grafana-operator/Chart.yaml b/clusters/cl01tl/helm/grafana-operator/Chart.yaml index 875c5ba3e..07a25cf9d 100644 --- a/clusters/cl01tl/helm/grafana-operator/Chart.yaml +++ b/clusters/cl01tl/helm/grafana-operator/Chart.yaml @@ -19,10 +19,6 @@ dependencies: - name: grafana-operator version: v5.20.0 repository: https://grafana.github.io/helm-charts - - name: postgres-cluster - alias: postgres-17-cluster - version: 6.16.1 - repository: oci://harbor.alexlebens.net/helm-charts - name: postgres-cluster alias: postgres-18-cluster version: 6.16.1 diff --git a/clusters/cl01tl/helm/grafana-operator/templates/external-secret.yaml b/clusters/cl01tl/helm/grafana-operator/templates/external-secret.yaml index c8122bb31..449d8ea0b 100644 --- a/clusters/cl01tl/helm/grafana-operator/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/grafana-operator/templates/external-secret.yaml @@ -57,73 +57,6 @@ spec: metadataPolicy: None property: secret ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: grafana-operator-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: grafana-operator-postgresql-17-cluster-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -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 - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: grafana-operator-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: grafana-operator-postgresql-17-cluster-backup-secret-garage - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - 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 - - secretKey: ACCESS_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /garage/home-infra/postgres-backups - metadataPolicy: None - property: ACCESS_REGION - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/helm/grafana-operator/values.yaml b/clusters/cl01tl/helm/grafana-operator/values.yaml index bcd4f45d4..58c99fc07 100644 --- a/clusters/cl01tl/helm/grafana-operator/values.yaml +++ b/clusters/cl01tl/helm/grafana-operator/values.yaml @@ -12,62 +12,6 @@ grafana-operator: enabled: true dashboard: enabled: false -postgres-17-cluster: - mode: recovery - cluster: - storage: - storageClass: local-path - walStorage: - storageClass: local-path - monitoring: - enabled: true - prometheusRule: - enabled: true - recovery: - method: objectStore - objectStore: - destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster - index: 2 - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: grafana-operator-postgresql-17-cluster-backup-secret-garage - # retentionPolicy: "30d" - # data: - # compression: bzip2 - # jobs: 2 - scheduledBackups: - - name: daily-backup - suspend: false - schedule: "0 0 0 * * *" - backupName: external - - name: live-backup - suspend: false - immediate: true - schedule: "0 0 0 * * *" - backupName: garage-local - # - name: weekly-backup - # suspend: false - # schedule: "0 0 4 * * SAT" - # backupName: garage-remote postgres-18-cluster: mode: recovery cluster: @@ -93,7 +37,7 @@ postgres-18-cluster: objectStore: - name: external destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster - index: 2 + index: 1 retentionPolicy: "30d" isWALArchiver: false - name: garage-local