diff --git a/clusters/cl01tl/helm/harbor/Chart.lock b/clusters/cl01tl/helm/harbor/Chart.lock index dc98dd167..ebc2d4045 100644 --- a/clusters/cl01tl/helm/harbor/Chart.lock +++ b/clusters/cl01tl/helm/harbor/Chart.lock @@ -5,8 +5,5 @@ dependencies: - name: postgres-cluster repository: https://gitea.alexlebens.net/api/packages/alexlebens/helm version: 6.16.1 -- name: postgres-cluster - repository: https://gitea.alexlebens.net/api/packages/alexlebens/helm - version: 6.16.1 -digest: sha256:24bf4ccbd2044f4e66bb79ae2cf05401bd06c7ec435145545cac4281ac81e789 -generated: "2025-12-11T20:43:34.596057-06:00" +digest: sha256:a8f5d259fb93f933050c498d9271a5b8606594c968a360f8be151f47b3feb49d +generated: "2025-12-11T20:49:18.650522-06:00" diff --git a/clusters/cl01tl/helm/harbor/Chart.yaml b/clusters/cl01tl/helm/harbor/Chart.yaml index a47910228..6053f7ce3 100644 --- a/clusters/cl01tl/helm/harbor/Chart.yaml +++ b/clusters/cl01tl/helm/harbor/Chart.yaml @@ -19,10 +19,6 @@ dependencies: - name: harbor version: 1.18.1 repository: https://helm.goharbor.io - - name: postgres-cluster - alias: postgres-17-cluster - version: 6.16.1 - repository: https://gitea.alexlebens.net/api/packages/alexlebens/helm - name: postgres-cluster alias: postgres-18-cluster version: 6.16.1 diff --git a/clusters/cl01tl/helm/harbor/templates/external-secret.yaml b/clusters/cl01tl/helm/harbor/templates/external-secret.yaml index 602a36e84..3a002d1c2 100644 --- a/clusters/cl01tl/helm/harbor/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/harbor/templates/external-secret.yaml @@ -134,73 +134,6 @@ spec: metadataPolicy: None property: tls.key ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: harbor-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: harbor-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: harbor-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: harbor-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/harbor/values.yaml b/clusters/cl01tl/helm/harbor/values.yaml index 88f87606b..eefb6ea09 100644 --- a/clusters/cl01tl/helm/harbor/values.yaml +++ b/clusters/cl01tl/helm/harbor/values.yaml @@ -96,62 +96,6 @@ harbor: repository: goharbor/harbor-exporter tag: v2.14.1 replicas: 2 -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/harbor/harbor-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: harbor-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/harbor/harbor-postgresql-17-cluster - index: 2 - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: harbor-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: harbor-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: