diff --git a/clusters/cl01tl/applications/jellyplist/Chart.yaml b/clusters/cl01tl/applications/jellyplist/Chart.yaml index 592005a98..658a933ea 100644 --- a/clusters/cl01tl/applications/jellyplist/Chart.yaml +++ b/clusters/cl01tl/applications/jellyplist/Chart.yaml @@ -24,13 +24,9 @@ dependencies: - name: valkey version: 2.2.0 repository: https://charts.bitnami.com/bitnami - - name: postgres-cluster - alias: postgres-16-cluster - version: 3.20.10 - repository: http://alexlebens.github.io/helm-charts - name: postgres-cluster alias: postgres-17-cluster version: 3.20.10 - repository: http://alexlebens.github.io/helm-charts + repository: http://alexlebens.github.io/helm-charts icon: https://raw.githubusercontent.com/kamilkosek/jellyplist/main/static/images/logo_large.png appVersion: v0.1.9 diff --git a/clusters/cl01tl/applications/jellyplist/templates/external-secret.yaml b/clusters/cl01tl/applications/jellyplist/templates/external-secret.yaml index 259ce76d3..c5fdf0404 100644 --- a/clusters/cl01tl/applications/jellyplist/templates/external-secret.yaml +++ b/clusters/cl01tl/applications/jellyplist/templates/external-secret.yaml @@ -57,38 +57,6 @@ spec: metadataPolicy: None property: key ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: jellyplist-postgresql-16-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: jellyplist-postgresql-16-cluster-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: database - 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/v1beta1 kind: ExternalSecret diff --git a/clusters/cl01tl/applications/jellyplist/values.yaml b/clusters/cl01tl/applications/jellyplist/values.yaml index a1bcd7828..3ad5d9e38 100644 --- a/clusters/cl01tl/applications/jellyplist/values.yaml +++ b/clusters/cl01tl/applications/jellyplist/values.yaml @@ -120,27 +120,8 @@ valkey: architecture: standalone auth: enabled: false -postgres-16-cluster: - mode: standalone - cluster: - walStorage: - storageClass: local-path - storage: - storageClass: local-path - monitoring: - enabled: true - bootstrap: - initdb: - postInitSQL: - - CREATE DATABASE "jellyplist" OWNER "app"; - backup: - enabled: true - endpointURL: https://nyc3.digitaloceanspaces.com - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellyplist/jellyplist-postgresql-16-cluster - endpointCredentials: jellyplist-postgresql-16-cluster-backup-secret - backupIndex: 1 postgres-17-cluster: - mode: replica + mode: standalone cluster: image: repository: ghcr.io/cloudnative-pg/postgresql @@ -154,21 +135,8 @@ postgres-17-cluster: bootstrap: initdb: database: jellyplist - owner: app - replica: - importType: microservice - importDatabases: - - jellyplist - externalCluster: - connectionParameters: - host: jellyplist-postgresql-16-cluster-rw - user: app - dbname: app - password: - name: jellyplist-postgresql-16-cluster-app - key: password backup: - enabled: false + enabled: true endpointURL: https://nyc3.digitaloceanspaces.com destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellyplist/jellyplist-postgresql-17-cluster endpointCredentials: jellyplist-postgresql-17-cluster-backup-secret