adjust some verbiage, fix

Author: benjaminjb

testing/chainsaw/e2e/pgbackrest-restore/README.md

@@ -2,3 +2,4 @@
 
 This [chainsaw](https://github.com/kyverno/chainsaw) suite tests that CPK can clone and restore through pgBackRest backups.
 
+...other material here...

testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml

@@ -20,7 +20,7 @@ spec:
       value: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
 
   steps:
-    - name: 'Create Cluster'
+    - name: 'Create Cluster with replica, tablespace'
       use: 
         template: 'templates/create-cluster.yaml'
 
@@ -36,8 +36,8 @@ spec:
             - name: command
               value: |
                      CREATE SCHEMA IF NOT EXISTS "original";
-                     CREATE TABLE IF NOT EXISTS important (data) AS VALUES ('treasure');
-                     CREATE TABLE IF NOT EXISTS cows (name) TABLESPACE barn AS VALUES ('nellie');
+                     CREATE TABLE important (data) AS VALUES ('treasure');
+                     CREATE TABLE cows (name) TABLESPACE barn AS VALUES ('nellie');
 
     - name: 'Create Backup #1'
       use: 
@@ -53,7 +53,7 @@ spec:
         template: 'templates/clone-cluster.yaml'
         with:
           bindings:
-            - name: target
+            - name: name
               value: clone-one
 
     - name: 'Verify Data on Clone #1'
@@ -90,8 +90,10 @@ spec:
               name: clone-one
 
     - name: 'Restart Cluster'
+      description: >
+        Sets a timestamp and restarts the cluster, using the timestamp for comparison
       use: 
-        template: 'templates/timestamp-and-restart-cluster.yaml'
+        template: 'templates/restart-cluster.yaml'
 
     - name: 'Update Data'
       use:
@@ -123,7 +125,7 @@ spec:
         template: 'templates/clone-cluster.yaml'
         with:
           bindings:
-            - name: target
+            - name: name
               value: clone-two
 
     - name: 'Verify Data on Clone #2'
@@ -160,6 +162,8 @@ spec:
               name: clone-two
 
     - name: 'Lose Data'
+      description: >
+        Drop data and ensure that the data is dropped from the replica as well
       use:
         template: 'templates/lose-data.yaml'
 
@@ -191,5 +195,7 @@ spec:
                       END $$$$;
 
     - name: 'Confirm Replica'
+      description: >
+        Verify that the data has streamed and is streaming to the replica
       use: 
         template: 'templates/verify-replica.yaml'

testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml

@@ -4,7 +4,7 @@ metadata:
   name: clone-cluster
 spec:
   bindings:
-    - name: target
+    - name: name
       value: 'The name of the new PostgresCluster'
 
   try:
@@ -16,7 +16,7 @@ spec:
           apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
-            name: ($target)
+            name: ($name)
           spec:
             dataSource:
               postgresCluster:
@@ -42,7 +42,7 @@ spec:
           apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
-            name: ($target)
+            name: ($name)
           status:
             instances:
               - name: '00'

testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml

@@ -21,7 +21,7 @@ spec:
 
     -
       description: >
-        Wait for it to complete
+        Wait for the backup to complete
       assert:
         resource:
           apiVersion: batch/v1

testing/chainsaw/e2e/pgbackrest-restore/templates/lose-data.yaml

@@ -1,7 +1,7 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: StepTemplate
 metadata:
-  name: 21-lose-data
+  name: lose-data
 spec:
   try:
     -
@@ -42,7 +42,7 @@ spec:
 
     -
       description: >
-        A reason to restore
+        Drop tables
       command:
         skipCommandOutput: true
         env:
@@ -100,7 +100,7 @@ spec:
 
     -
       description: >
-        Confirm that the replica also needs to be restored
+        Confirm that the replica also has lost the data that was dropped
       command:
         skipCommandOutput: true
         env:

testing/chainsaw/e2e/pgbackrest-restore/templates/psql-data.yaml

@@ -22,7 +22,7 @@ spec:
 
     -
       description: >
-        Create some data that will be restored
+        Run a command through psql to create/verify data
       apply:
         resource:
           apiVersion: batch/v1
@@ -43,12 +43,13 @@ spec:
                         valueFrom: { secretKeyRef: { name: ($secret), key: host } }
                       - name: PGPORT
                         valueFrom: { secretKeyRef: { name: ($secret), key: port } }
+                      # Always connect to the database using the original dbname, user, password
                       - name: PGDATABASE
-                        valueFrom: { secretKeyRef: { name: ($secret), key: dbname } }
+                        valueFrom: { secretKeyRef: { name: original-pguser-original, key: dbname } }
                       - name: PGUSER
-                        valueFrom: { secretKeyRef: { name: ($secret), key: user } }
+                        valueFrom: { secretKeyRef: { name: original-pguser-original, key: user } }
                       - name: PGPASSWORD
-                        valueFrom: { secretKeyRef: { name: ($secret), key: password } }
+                        valueFrom: { secretKeyRef: { name: original-pguser-original, key: password } }
                     command:
                       - psql
                       - -qa

…lates/timestamp-and-restart-cluster.yaml …t-restore/templates/restart-cluster.yamltesting/chainsaw/e2e/pgbackrest-restore/templates/timestamp-and-restart-cluster.yaml renamed to testing/chainsaw/e2e/pgbackrest-restore/templates/restart-cluster.yaml testing/chainsaw/e2e/pgbackrest-restore/templates/timestamp-and-restart-cluster.yaml renamed to testing/chainsaw/e2e/pgbackrest-restore/templates/restart-cluster.yaml

@@ -113,8 +113,6 @@ spec:
 
   catch:
     -
-      description: >
-        Read all log lines from the job pods
       podLogs:
         selector: batch.kubernetes.io/job-name in (original-pitr-replica)
         tail: -1