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

---
 clusters/cl01tl/platform/ollama/Chart.yaml    |  4 ---
 .../ollama/templates/external-secret.yaml     | 32 -------------------
 clusters/cl01tl/platform/ollama/values.yaml   | 32 ++-----------------
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/clusters/cl01tl/platform/ollama/Chart.yaml b/clusters/cl01tl/platform/ollama/Chart.yaml
index b11940c71..04ec2ac04 100644
--- a/clusters/cl01tl/platform/ollama/Chart.yaml
+++ b/clusters/cl01tl/platform/ollama/Chart.yaml
@@ -21,10 +21,6 @@ dependencies:
     alias: ollama
     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/platform/ollama/templates/external-secret.yaml b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
index 2b3c451f0..11aa2a5cc 100644
--- a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
@@ -173,38 +173,6 @@ spec:
         metadataPolicy: None
         property: secret_key
 
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: ollama-web-postgresql-16-cluster-backup-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: ollama-web-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/platform/ollama/values.yaml b/clusters/cl01tl/platform/ollama/values.yaml
index 0d8f0761b..a76daa509 100644
--- a/clusters/cl01tl/platform/ollama/values.yaml
+++ b/clusters/cl01tl/platform/ollama/values.yaml
@@ -136,25 +136,9 @@ ollama:
           main:
             - path: /app/backend/data
               readOnly: false
-postgres-16-cluster:
-  nameOverride: ollama-web-postgresql-16
-  mode: standalone
-  cluster:
-    walStorage:
-      storageClass: local-path
-    storage:
-      storageClass: local-path
-    monitoring:
-      enabled: true
-  backup:
-    enabled: true
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-16-cluster
-    endpointCredentials: ollama-web-postgresql-16-cluster-backup-secret
-    backupIndex: 1
 postgres-17-cluster:
   nameOverride: ollama-web-postgresql-17
-  mode: replica
+  mode: standalone
   cluster:
     image:
       repository: ghcr.io/cloudnative-pg/postgresql
@@ -165,20 +149,8 @@ postgres-17-cluster:
       storageClass: local-path
     monitoring:
       enabled: true
-  replica:
-    importType: microservice
-    importDatabases:
-      - app
-    externalCluster:
-      connectionParameters:
-        host: ollama-web-postgresql-16-cluster-rw
-        user: app
-        dbname: app
-      password:
-        name: ollama-web-postgresql-16-cluster-app
-        key: password
   backup:
-    enabled: false
+    enabled: true
     endpointURL: https://nyc3.digitaloceanspaces.com
     destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-17-cluster
     endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret