Wait for Patroni labels in tests that switchover

Author: cbandy

testing/kuttl/e2e/delete/10-assert.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
@@ -9,6 +10,22 @@ status:
       replicas: 2
       updatedReplicas: 2
 ---
+# Patroni labels and readiness happen separately.
+# The next step expects to find pods by their role label; wait for them here.
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/cluster: delete-switchover
+    postgres-operator.crunchydata.com/role: master
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/cluster: delete-switchover
+    postgres-operator.crunchydata.com/role: replica
+---
 apiVersion: batch/v1
 kind: Job
 metadata:

testing/kuttl/e2e/delete/11-annotate.yaml

@@ -2,7 +2,8 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  # Label instance pods with their current role for assert
+  # Label instance pods with their current role. These labels will stick around
+  # because switchover does not recreate any pods.
   - script: |
       kubectl label --namespace="${NAMESPACE}" pods \
         --selector='postgres-operator.crunchydata.com/role=master' \

testing/kuttl/e2e/delete/12-assert.yaml

@@ -1,5 +1,5 @@
 ---
-# After switchover, a former replica should now be the primary.
+# Wait for switchover to finish. A former replica should now be the primary.
 apiVersion: v1
 kind: Pod
 metadata:

testing/kuttl/e2e/switchover/01-assert.yaml

@@ -9,3 +9,19 @@ status:
       replicas: 2
       readyReplicas: 2
       updatedReplicas: 2
+---
+# Patroni labels and readiness happen separately.
+# The next step expects to find pods by their role label; wait for them here.
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/cluster: switchover
+    postgres-operator.crunchydata.com/role: master
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/cluster: switchover
+    postgres-operator.crunchydata.com/role: replica