From ad66b69eff9dc3a46f3219ed7d2d324b550a6a48 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sun, 22 Dec 2024 17:38:59 -0600
Subject: [PATCH] remove pg-16

---
 .../cl01tl/applications/lidarr2/Chart.yaml    |  4 --
 .../lidarr2/templates/external-secret.yaml    | 32 --------------
 .../cl01tl/applications/lidarr2/values.yaml   | 43 +++----------------
 3 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/clusters/cl01tl/applications/lidarr2/Chart.yaml b/clusters/cl01tl/applications/lidarr2/Chart.yaml
index 69329a357..59fa71d29 100644
--- a/clusters/cl01tl/applications/lidarr2/Chart.yaml
+++ b/clusters/cl01tl/applications/lidarr2/Chart.yaml
@@ -22,10 +22,6 @@ dependencies:
     alias: lidarr2
     repository: https://bjw-s.github.io/helm-charts/
     version: 3.5.1
-  - name: postgres-cluster
-    alias: postgres-16-cluster
-    version: 3.21.0
-    repository: http://alexlebens.github.io/helm-charts
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 3.21.0
diff --git a/clusters/cl01tl/applications/lidarr2/templates/external-secret.yaml b/clusters/cl01tl/applications/lidarr2/templates/external-secret.yaml
index 6110ade97..6714938d1 100644
--- a/clusters/cl01tl/applications/lidarr2/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/lidarr2/templates/external-secret.yaml
@@ -56,38 +56,6 @@ spec:
         metadataPolicy: None
         property: secret_key
 
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: lidarr2-postgresql-16-cluster-backup-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: lidarr2-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/lidarr2/values.yaml b/clusters/cl01tl/applications/lidarr2/values.yaml
index 296aee9c7..040a8d3e6 100644
--- a/clusters/cl01tl/applications/lidarr2/values.yaml
+++ b/clusters/cl01tl/applications/lidarr2/values.yaml
@@ -141,29 +141,8 @@ lidarr2:
           main:
             - path: /mnt/store
               readOnly: false
-postgres-16-cluster:
-  mode: standalone
-  cluster:
-    enableSuperuserAccess: true
-    walStorage:
-      storageClass: local-path
-    storage:
-      storageClass: local-path
-    monitoring:
-      enabled: true
-    initdb:
-      postInitSQL:
-        - CREATE DATABASE "lidarr-main" OWNER "app";
-        - CREATE DATABASE "lidarr-log" OWNER "app";
-  backup:
-    enabled: true
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/lidarr2/lidarr2-postgresql-16-cluster
-    endpointCredentials: lidarr2-postgresql-16-cluster-backup-secret
-    backupIndex: 1
-    retentionPolicy: "7d"
 postgres-17-cluster:
-  mode: replica
+  mode: standalone
   cluster:
     image:
       repository: ghcr.io/cloudnative-pg/postgresql
@@ -174,21 +153,13 @@ postgres-17-cluster:
       storageClass: local-path
     monitoring:
       enabled: true
-  replica:
-    importType: monolith
-    importDatabases:
-      - lidarr-main
-      - lidarr-log
-    externalCluster:
-      connectionParameters:
-        host: lidarr2-postgresql-16-cluster-rw
-        user: postgres
-        dbname: postgres
-      password:
-        name: lidarr2-postgresql-16-cluster-superuser
-        key: password
+  bootstrap:
+    initdb:
+      postInitSQL:
+        - CREATE DATABASE "lidarr-main" OWNER "app";
+        - CREATE DATABASE "lidarr-log" OWNER "app";
   backup:
-    enabled: false
+    enabled: true
     endpointURL: https://nyc3.digitaloceanspaces.com
     destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/lidarr2/lidarr2-postgresql-17-cluster
     endpointCredentials: lidarr2-postgresql-17-cluster-backup-secret