Merge f75e3f1b63 into a7aaad0a0b

e2e/tests/k8s_api.py

@@ -92,10 +92,13 @@ class K8s:
             namespace='default'
         )
 
-    def pg_get_status(self, name="acid-minimal-cluster", namespace="default"):
+    def pg_get(self, name="acid-minimal-cluster", namespace="default"):
         pg = self.api.custom_objects_api.get_namespaced_custom_object(
             "acid.zalan.do", "v1", namespace, "postgresqls", name)
-        return pg.get("status", {}).get("PostgresClusterStatus", None)
+        return pg
+
+    def pg_get_status(self, name="acid-minimal-cluster", namespace="default"):
+        return pg_get(self, name, namespace).get("status", {})
 
     def wait_for_pod_start(self, pod_labels, namespace='default'):
         pod_phase = 'No pod running'

e2e/tests/test_e2e.py

@@ -71,6 +71,19 @@ class EndToEndTestCase(unittest.TestCase):
                     raise
                 time.sleep(interval)
 
+    def eventuallyTrueFunc(self, f, xf, m, retries=60, interval=2):
+        while True:
+            try:
+                y = f()
+                x = xf(y)
+                self.assertTrue(xf(y), m)
+                return True
+            except AssertionError:
+                retries = retries - 1
+                if not retries > 0:
+                    raise
+                time.sleep(interval)
+
     @classmethod
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
     def setUpClass(cls):
@@ -1669,6 +1682,13 @@ class EndToEndTestCase(unittest.TestCase):
         self.eventuallyEqual(lambda: k8s.get_deployment_replica_count(name=pooler_name), 2,
                              "Operator did not succeed in overwriting labels")
 
+        # status observedGeneration should match metadata.generation
+        self.eventuallyTrueFunc(
+            lambda: k8s.pg_get(),
+            lambda pg: pg.get("metadata", {}).get("generation", 0) == pg.get("status", {}).get("observedGeneration", -1),
+            "Expected generation and status.observedGeneration to match",
+        )
+
         k8s.api.custom_objects_api.patch_namespaced_custom_object(
         'acid.zalan.do', 'v1', 'default',
         'postgresqls', 'acid-minimal-cluster',
@@ -1682,6 +1702,13 @@ class EndToEndTestCase(unittest.TestCase):
         self.eventuallyEqual(lambda: k8s.count_running_pods("connection-pooler="+pooler_name),
                              0, "Pooler pods not scaled down")
 
+        # status observedGeneration should match metadata.generation
+        self.eventuallyTrueFunc(
+            lambda: k8s.pg_get(),
+            lambda pg: pg.get("metadata", {}).get("generation", 0) == pg.get("status", {}).get("observedGeneration", -1),
+            "Expected generation and status.observedGeneration to match",
+        )
+
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
     def test_owner_references(self):
         '''
@@ -2021,7 +2048,7 @@ class EndToEndTestCase(unittest.TestCase):
 
             # pod_label_wait_timeout should have been exceeded hence the rolling update is continued on next sync
             # check if the cluster state is "SyncFailed"
-            self.eventuallyEqual(lambda: k8s.pg_get_status(), "SyncFailed", "Expected SYNC event to fail")
+            self.eventuallyEqual(lambda: k8s.pg_get_status(), {"PostgresClusterStatus": "SyncFailed"}, "Expected SYNC event to fail")
 
             # wait for next sync, replica should be running normally by now and be ready for switchover
             k8s.wait_for_pod_failover(replica_nodes, 'spilo-role=master,' + cluster_label)
@@ -2036,7 +2063,13 @@ class EndToEndTestCase(unittest.TestCase):
 
             # status should again be "SyncFailed" but turn into "Running" on the next sync
             time.sleep(30)
-            self.eventuallyEqual(lambda: k8s.pg_get_status(), "Running", "Expected running cluster after two syncs")
+            self.eventuallyEqual(lambda: k8s.pg_get_status(), {"PostgresClusterStatus": "Running"}, "Expected running cluster after two syncs")
+            # status observedGeneration should match metadata.generation
+            self.eventuallyTrueFunc(
+                lambda: k8s.pg_get(),
+                lambda pg: pg.get("metadata", {}).get("generation", 0) == pg.get("status", {}).get("observedGeneration", -1),
+                "Expected generation and status.observedGeneration to match",
+            )
 
             # revert config changes
             patch_resync_config = {