From 9e96dd991688c927171dfbb3e0e0fce18a720704 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Tue, 15 Aug 2023 16:32:33 +0000
Subject: [PATCH] Fixed sops issues.

---
 .../cloudnative-pg/cluster/cluster.yaml       | 12 ++--------
 .../cluster/externalsecret.yaml               | 22 -------------------
 .../cloudnative-pg/cluster/kustomization.yaml |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 kubernetes/apps/database/cloudnative-pg/cluster/externalsecret.yaml

diff --git a/kubernetes/apps/database/cloudnative-pg/cluster/cluster.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/cluster.yaml
index 568af20..cf30b49 100644
--- a/kubernetes/apps/database/cloudnative-pg/cluster/cluster.yaml
+++ b/kubernetes/apps/database/cloudnative-pg/cluster/cluster.yaml
@@ -33,11 +33,7 @@ spec:
         compression: bzip2
         maxParallel: 8
       destinationPath: s3://valinor-cnpg/
-      endpointURL:
-        valueFrom:
-          secretKeyRef:
-            name: cnpg-secret
-            key: CLOUDFLARE_R2_ENDPOINT
+      endpointURL: https://${SECRET_CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com
       serverName: postgres-v3
       s3Credentials:
         accessKeyId:
@@ -49,11 +45,7 @@ spec:
   externalClusters:
     - name: clusterBackup
       barmanObjectStore:
-        destinationPath:
-          valueFrom:
-            secretKeyRef:
-              name: cnpg-secret
-              key: CLOUDFLARE_R2_ENDPOINT
+        destinationPath: https://${SECRET_CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com
         s3Credentials:
         accessKeyId:
           name: cloudnative-pg-secret
diff --git a/kubernetes/apps/database/cloudnative-pg/cluster/externalsecret.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/externalsecret.yaml
deleted file mode 100644
index b64662b..0000000
--- a/kubernetes/apps/database/cloudnative-pg/cluster/externalsecret.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: cnpg
-  namespace: database
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: onepassword-connect
-  target:
-    name: cnpg-secret
-    creationPolicy: Owner
-    template:
-      engineVersion: v2
-      data:
-        CLOUDFLARE_R2_ENDPOINT: "https://{{ .cloudflare_account_id }}.r2.cloudflarestorage.com"
-  data:
-    - secretKey: cloudflare_account_id
-      remoteRef:
-        key: cloudflare
-        property: account_id
diff --git a/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml
index 79ff129..f3e27b6 100644
--- a/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml
+++ b/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: fediverse
 resources:
   - ./cluster.yaml
-  - ./externalsecret.yaml
   - ./scheduledbackup.yaml
   - ./prometheusrule.yaml
   # - ./service.yaml