From 302c05efb1d84f180cc8cd305ab116d6968946c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20No=C3=ABl?= <21990816+philippemnoel@users.noreply.github.com> Date: Sun, 22 Sep 2024 11:52:11 -0400 Subject: [PATCH] chore: Try with adding missing -cluster (#33) --- charts/paradedb/Chart.yaml | 2 +- .../monitoring/01-monitoring_cluster-assert.yaml | 12 ++++++------ .../01-paradedb_cluster-assert.yaml | 2 +- .../01-paradedb_cluster.yaml | 2 -- .../02-paradedb_write.yaml | 2 +- .../03-paradedb_test.yaml | 2 +- .../paradedb-minio-backup-restore/04-data_write.yaml | 2 +- .../paradedb-minio-backup-restore/05-backup.yaml | 2 +- .../05-backup_completed-assert.yaml | 2 +- .../05-backup_running-assert.yaml | 2 +- .../paradedb-minio-backup-restore/05-checkpoint.yaml | 2 +- .../06-post_backup_data_write.yaml | 2 +- .../07-recovery_backup_pitr_cluster-assert.yaml | 2 +- .../paradedb-minio-backup-restore/08-data_test.yaml | 2 +- .../paradedb-minio-backup-restore/chainsaw-test.yaml | 2 +- .../test/pooler/01-pooler_cluster-assert.yaml | 6 +++--- .../01-non_default_configuration_cluster-assert.yaml | 2 +- .../01-standalone_cluster-assert.yaml | 2 +- .../02-data_write.yaml | 2 +- .../postgresql-minio-backup-restore/03-backup.yaml | 2 +- .../03-backup_completed-assert.yaml | 2 +- .../03-backup_running-assert.yaml | 2 +- .../03-checkpoint.yaml | 2 +- .../04-post_backup_data_write.yaml | 2 +- .../05-recovery_backup_cluster-assert.yaml | 2 +- .../06-data_test.yaml | 2 +- .../07-recovery_object_store_cluster-assert.yaml | 2 +- .../07-recovery_object_store_cluster.yaml | 2 +- .../08-data_test.yaml | 2 +- .../09-recovery_backup_pitr_cluster-assert.yaml | 2 +- .../10-data_test.yaml | 2 +- .../00-source-cluster-assert.yaml | 2 +- .../test/postgresql-pg_basebackup/01-data_write.yaml | 6 +++--- .../02-pg_basebackup-cluster-assert.yaml | 2 +- .../02-pg_basebackup-cluster.yaml | 6 +++--- .../test/postgresql-pg_basebackup/03-data_test.yaml | 2 +- .../01-timescale_cluster-assert.yaml | 2 +- .../01-timescale_cluster.yaml | 1 - .../03-timescale_test.yaml | 2 +- .../04-data_write.yaml | 2 +- .../timescale-minio-backup-restore/05-backup.yaml | 2 +- .../05-backup_completed-assert.yaml | 2 +- .../05-backup_running-assert.yaml | 2 +- .../05-checkpoint.yaml | 2 +- .../06-post_backup_data_write.yaml | 2 +- .../07-recovery_backup_pitr_cluster-assert.yaml | 2 +- .../timescale-minio-backup-restore/08-data_test.yaml | 2 +- 47 files changed, 56 insertions(+), 59 deletions(-) diff --git a/charts/paradedb/Chart.yaml b/charts/paradedb/Chart.yaml index f3edfebd6..d554ef182 100644 --- a/charts/paradedb/Chart.yaml +++ b/charts/paradedb/Chart.yaml @@ -14,7 +14,7 @@ # limitations under the License. # apiVersion: v2 -name: paradedb-cluster +name: paradedb description: Deploys and manages a ParadeDB CloudNativePG cluster and its associated resources. icon: https://raw.githubusercontent.com/paradedb/paradedb/main/docs/logo/light.svg type: application diff --git a/charts/paradedb/test/monitoring/01-monitoring_cluster-assert.yaml b/charts/paradedb/test/monitoring/01-monitoring_cluster-assert.yaml index baac2f2ec..ad5e0987f 100644 --- a/charts/paradedb/test/monitoring/01-monitoring_cluster-assert.yaml +++ b/charts/paradedb/test/monitoring/01-monitoring_cluster-assert.yaml @@ -1,30 +1,30 @@ apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: - name: monitoring-paradedb-cluster + name: monitoring-paradedb spec: selector: matchLabels: - cnpg.io/cluster: monitoring-paradedb-cluster + cnpg.io/cluster: monitoring-paradedb --- apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: - name: monitoring-paradedb-cluster-pooler-rw + name: monitoring-paradedb-pooler-rw spec: selector: matchLabels: - cnpg.io/poolerName: monitoring-paradedb-cluster-pooler-rw + cnpg.io/poolerName: monitoring-paradedb-pooler-rw --- apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: monitoring-paradedb-cluster-alert-rules + name: monitoring-paradedb-alert-rules --- apiVersion: v1 kind: ConfigMap metadata: - name: monitoring-paradedb-cluster-monitoring + name: monitoring-paradedb-monitoring data: custom-queries: | pg_cache_hit_ratio: 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 index 1b995d1d2..b72bd8548 100644 --- 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-cluster + 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 index 4f257ed90..3bae23341 100644 --- 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 index df7dd9259..56d96ba64 100644 --- 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-cluster-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 index befadcfc5..3741db798 100644 --- 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-cluster-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 index aa8b243f0..c215d365f 100644 --- 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-cluster-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 index d8ac63218..56933359e 100644 --- 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-cluster + 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 index c1103592e..cc179ed65 100644 --- 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-cluster + 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 index cdb6605f2..bc609eca5 100644 --- 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-cluster + 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 index 7d6abe4e4..e59ff1f70 100644 --- 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-cluster-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 index 599a37a48..582104f7d 100644 --- 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-cluster-superuser + name: paradedb-superuser key: uri - name: NAMESPACE valueFrom: diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml index 096619f0e..640223c16 100644 --- a/charts/paradedb/test/paradedb-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml +++ b/charts/paradedb/test/paradedb-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: recovery-backup-pitr-paradedb-cluster + name: recovery-backup-pitr-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/08-data_test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/08-data_test.yaml index 8e88f58a7..412852502 100644 --- a/charts/paradedb/test/paradedb-minio-backup-restore/08-data_test.yaml +++ b/charts/paradedb/test/paradedb-minio-backup-restore/08-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: recovery-backup-pitr-paradedb-cluster-superuser + name: recovery-backup-pitr-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml index 7af6da771..156a26f01 100644 --- 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-cluster + 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/pooler/01-pooler_cluster-assert.yaml b/charts/paradedb/test/pooler/01-pooler_cluster-assert.yaml index 3b5b778b2..080560e8c 100644 --- a/charts/paradedb/test/pooler/01-pooler_cluster-assert.yaml +++ b/charts/paradedb/test/pooler/01-pooler_cluster-assert.yaml @@ -1,17 +1,17 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: pooler-paradedb-cluster-pooler-rw + name: pooler-paradedb-pooler-rw status: readyReplicas: 2 --- apiVersion: postgresql.cnpg.io/v1 kind: Pooler metadata: - name: pooler-paradedb-cluster-pooler-rw + name: pooler-paradedb-pooler-rw spec: cluster: - name: pooler-paradedb-cluster + name: pooler-paradedb instances: 2 pgbouncer: poolMode: transaction diff --git a/charts/paradedb/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml b/charts/paradedb/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml index c94daffdd..ef3ce169c 100644 --- a/charts/paradedb/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml @@ -1,7 +1,7 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: non-default-configuration-paradedb-cluster + name: non-default-configuration-paradedb labels: foo: bar annotations: diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/01-standalone_cluster-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/01-standalone_cluster-assert.yaml index 46f4eb6b8..d759bfcdb 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/01-standalone_cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/01-standalone_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: standalone-paradedb-cluster + name: standalone-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/02-data_write.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/02-data_write.yaml index f154aa447..34a3d2371 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/02-data_write.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/02-data_write.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: standalone-paradedb-cluster-superuser + name: standalone-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup.yaml index 1f7f6a60b..8fe8c4686 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup.yaml @@ -5,4 +5,4 @@ metadata: spec: method: barmanObjectStore cluster: - name: standalone-paradedb-cluster + name: standalone-paradedb diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_completed-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_completed-assert.yaml index 1d0d3fc25..efffadd46 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_completed-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_completed-assert.yaml @@ -4,7 +4,7 @@ metadata: name: post-init-backup spec: cluster: - name: standalone-paradedb-cluster + name: standalone-paradedb method: barmanObjectStore status: phase: completed diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_running-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_running-assert.yaml index b6578ba09..ab709ada9 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_running-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/03-backup_running-assert.yaml @@ -4,7 +4,7 @@ metadata: name: post-init-backup spec: cluster: - name: standalone-paradedb-cluster + name: standalone-paradedb method: barmanObjectStore status: phase: running diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/03-checkpoint.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/03-checkpoint.yaml index a4f396898..680ba1b2d 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/03-checkpoint.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/03-checkpoint.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: standalone-paradedb-cluster-superuser + name: standalone-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/04-post_backup_data_write.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/04-post_backup_data_write.yaml index 207ed5445..50c7ab6a2 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/04-post_backup_data_write.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/04-post_backup_data_write.yaml @@ -39,7 +39,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: standalone-paradedb-cluster-superuser + name: standalone-paradedb-superuser key: uri - name: NAMESPACE valueFrom: diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/05-recovery_backup_cluster-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/05-recovery_backup_cluster-assert.yaml index a138ec961..3d99b1357 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/05-recovery_backup_cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/05-recovery_backup_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: recovery-backup-paradedb-cluster + name: recovery-backup-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/06-data_test.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/06-data_test.yaml index 95d2343ec..734b45f41 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/06-data_test.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/06-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: recovery-backup-paradedb-cluster-superuser + name: recovery-backup-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster-assert.yaml index 783ca7823..d9895f17c 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: recovery-object-store-paradedb-cluster + name: recovery-object-store-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster.yaml index d372b1598..07f5dbc53 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster.yaml @@ -8,7 +8,7 @@ cluster: recovery: method: object_store - clusterName: "standalone-paradedb-cluster" + clusterName: "standalone-paradedb" provider: s3 endpointURL: "https://minio.minio.svc.cluster.local" endpointCA: diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/08-data_test.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/08-data_test.yaml index 3df8e415f..402d243ad 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/08-data_test.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/08-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: recovery-object-store-paradedb-cluster-superuser + name: recovery-object-store-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/09-recovery_backup_pitr_cluster-assert.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/09-recovery_backup_pitr_cluster-assert.yaml index 096619f0e..640223c16 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/09-recovery_backup_pitr_cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/09-recovery_backup_pitr_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: recovery-backup-pitr-paradedb-cluster + name: recovery-backup-pitr-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/postgresql-minio-backup-restore/10-data_test.yaml b/charts/paradedb/test/postgresql-minio-backup-restore/10-data_test.yaml index 8e88f58a7..412852502 100644 --- a/charts/paradedb/test/postgresql-minio-backup-restore/10-data_test.yaml +++ b/charts/paradedb/test/postgresql-minio-backup-restore/10-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: recovery-backup-pitr-paradedb-cluster-superuser + name: recovery-backup-pitr-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/postgresql-pg_basebackup/00-source-cluster-assert.yaml b/charts/paradedb/test/postgresql-pg_basebackup/00-source-cluster-assert.yaml index 899732fc6..f68d5419a 100644 --- a/charts/paradedb/test/postgresql-pg_basebackup/00-source-cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-pg_basebackup/00-source-cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: source-paradedb-cluster + name: source-paradedb status: readyInstances: 1 diff --git a/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml b/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml index 8304c3843..17f92db89 100644 --- a/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml +++ b/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml @@ -12,15 +12,15 @@ spec: - name: DB_USER valueFrom: secretKeyRef: - name: source-paradedb-cluster-superuser + name: source-paradedb-superuser key: username - name: DB_PASS valueFrom: secretKeyRef: - name: source-paradedb-cluster-superuser + name: source-paradedb-superuser key: password - name: DB_URI - value: postgres://$(DB_USER):$(DB_PASS)@source-paradedb-cluster-rw:5432 + value: postgres://$(DB_USER):$(DB_PASS)@source-paradedb-rw:5432 image: alpine:3.19 command: ['sh', '-c'] args: diff --git a/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster-assert.yaml b/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster-assert.yaml index ef179278c..511de6837 100644 --- a/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster-assert.yaml +++ b/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: pg-basebackup-paradedb-cluster + name: pg-basebackup-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster.yaml b/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster.yaml index 099a599dc..0042bd629 100644 --- a/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster.yaml +++ b/charts/paradedb/test/postgresql-pg_basebackup/02-pg_basebackup-cluster.yaml @@ -4,15 +4,15 @@ recovery: method: "pg_basebackup" pgBaseBackup: source: - host: "source-paradedb-cluster-rw" + host: "source-paradedb-rw" database: "mygooddb" username: "streaming_replica" sslMode: "require" sslKeySecret: - name: source-paradedb-cluster-replication + name: source-paradedb-replication key: tls.key sslCertSecret: - name: source-paradedb-cluster-replication + name: source-paradedb-replication key: tls.crt cluster: diff --git a/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml b/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml index ed969256d..487e25bf2 100644 --- a/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml +++ b/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: pg-basebackup-paradedb-cluster-superuser + name: pg-basebackup-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster-assert.yaml b/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster-assert.yaml index 7dfd88ea2..33ef2bb16 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster-assert.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/01-timescale_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: timescale-paradedb-cluster + name: timescale-paradedb status: readyInstances: 2 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 index f84117fe0..552d2d947 100644 --- 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: diff --git a/charts/paradedb/test/timescale-minio-backup-restore/03-timescale_test.yaml b/charts/paradedb/test/timescale-minio-backup-restore/03-timescale_test.yaml index 174db0aed..3caf09cad 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/03-timescale_test.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/03-timescale_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: timescale-paradedb-cluster-app + name: timescale-paradedb-app key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/timescale-minio-backup-restore/04-data_write.yaml b/charts/paradedb/test/timescale-minio-backup-restore/04-data_write.yaml index 5eeb0b355..365a1d761 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/04-data_write.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/04-data_write.yaml @@ -39,7 +39,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: timescale-paradedb-cluster-superuser + name: timescale-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/timescale-minio-backup-restore/05-backup.yaml b/charts/paradedb/test/timescale-minio-backup-restore/05-backup.yaml index 46ee202f4..042c5e590 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/05-backup.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/05-backup.yaml @@ -5,4 +5,4 @@ metadata: spec: method: barmanObjectStore cluster: - name: timescale-paradedb-cluster + name: timescale-paradedb diff --git a/charts/paradedb/test/timescale-minio-backup-restore/05-backup_completed-assert.yaml b/charts/paradedb/test/timescale-minio-backup-restore/05-backup_completed-assert.yaml index 9572743bb..0edeff5d9 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/05-backup_completed-assert.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/05-backup_completed-assert.yaml @@ -4,7 +4,7 @@ metadata: name: post-init-backup spec: cluster: - name: timescale-paradedb-cluster + name: timescale-paradedb method: barmanObjectStore status: phase: completed diff --git a/charts/paradedb/test/timescale-minio-backup-restore/05-backup_running-assert.yaml b/charts/paradedb/test/timescale-minio-backup-restore/05-backup_running-assert.yaml index f6c8a3503..133f9863f 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/05-backup_running-assert.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/05-backup_running-assert.yaml @@ -4,7 +4,7 @@ metadata: name: post-init-backup spec: cluster: - name: timescale-paradedb-cluster + name: timescale-paradedb method: barmanObjectStore status: phase: running diff --git a/charts/paradedb/test/timescale-minio-backup-restore/05-checkpoint.yaml b/charts/paradedb/test/timescale-minio-backup-restore/05-checkpoint.yaml index 669dc04d0..4b564d49c 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/05-checkpoint.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/05-checkpoint.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: timescale-paradedb-cluster-superuser + name: timescale-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c'] diff --git a/charts/paradedb/test/timescale-minio-backup-restore/06-post_backup_data_write.yaml b/charts/paradedb/test/timescale-minio-backup-restore/06-post_backup_data_write.yaml index fe7fdebf2..0df30b2ae 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/06-post_backup_data_write.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/06-post_backup_data_write.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: timescale-paradedb-cluster-superuser + name: timescale-paradedb-superuser key: uri - name: NAMESPACE valueFrom: diff --git a/charts/paradedb/test/timescale-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml b/charts/paradedb/test/timescale-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml index 096619f0e..640223c16 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml @@ -1,6 +1,6 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: recovery-backup-pitr-paradedb-cluster + name: recovery-backup-pitr-paradedb status: readyInstances: 2 diff --git a/charts/paradedb/test/timescale-minio-backup-restore/08-data_test.yaml b/charts/paradedb/test/timescale-minio-backup-restore/08-data_test.yaml index 8e88f58a7..412852502 100644 --- a/charts/paradedb/test/timescale-minio-backup-restore/08-data_test.yaml +++ b/charts/paradedb/test/timescale-minio-backup-restore/08-data_test.yaml @@ -12,7 +12,7 @@ spec: - name: DB_URI valueFrom: secretKeyRef: - name: recovery-backup-pitr-paradedb-cluster-superuser + name: recovery-backup-pitr-paradedb-superuser key: uri image: alpine:3.19 command: ['sh', '-c']