chore: Try with adding missing -cluster (#33)

paradedb · Sep 22, 2024 · 302c05e · 302c05e
1 parent df4cbc9
commit 302c05e
Show file tree

Hide file tree

Showing 47 changed files with 56 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...s/paradedb/test/paradedb-minio-backup-restore/07-recovery_backup_pitr_cluster-assert.yaml b/...s/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
@@ -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
@@ -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
@@ -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/...db/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml b/...db/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...aradedb/test/postgresql-minio-backup-restore/07-recovery_object_store_cluster-assert.yaml b/...aradedb/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
@@ -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
@@ -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/...paradedb/test/postgresql-minio-backup-restore/09-recovery_backup_pitr_cluster-assert.yaml b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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']