try this

paradedb · Sep 22, 2024 · 2342d5a · 2342d5a
1 parent 6ba4da6
commit 2342d5a
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 13 deletions.
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml
@@ -1,6 +1,6 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: paradedb-paradedb
+  name: paradedb
 status:
   readyInstances: 2
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml
@@ -1,7 +1,5 @@
 type: paradedb
 mode: standalone
-version:
-  paradedb: 0.9.4
 
 cluster:
   instances: 2

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-app
+                name: paradedb-app
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-app
+                name: paradedb-app
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml
@@ -39,7 +39,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-superuser
+                name: paradedb-superuser
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/05-backup.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/05-backup.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   method: barmanObjectStore
   cluster:
-    name: paradedb-paradedb
+    name: paradedb
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml
@@ -4,7 +4,7 @@ metadata:
   name: post-init-backup
 spec:
   cluster:
-    name: paradedb-paradedb
+    name: paradedb
   method: barmanObjectStore
 status:
   phase: completed
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml
@@ -4,7 +4,7 @@ metadata:
   name: post-init-backup
 spec:
   cluster:
-    name: paradedb-paradedb
+    name: paradedb
   method: barmanObjectStore
 status:
   phase: running
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-superuser
+                name: paradedb-superuser
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-superuser
+                name: paradedb-superuser
                 key: uri
           - name: NAMESPACE
             valueFrom:

diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml
@@ -123,7 +123,7 @@ spec:
             apiVersion: postgresql.cnpg.io/v1
             kind: Cluster
         - podLogs:
-            selector: cnpg.io/cluster=paradedb
+            selector: cnpg.io/cluster=recovery-backup-pitr-cluster
     - name: Verify the pre-backup data on the recovery cluster exists but not the post-backup data
       try:
         - apply:

diff --git a/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster.yaml b/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster.yaml
@@ -8,7 +8,6 @@ cluster:
 
 backups:
   enabled: true
-
   provider: s3
   endpointURL: "https://minio.minio.svc.cluster.local"
   endpointCA: