From 30cd4edd0997aee9926e18ab62b48ba4513e1eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Tue, 27 Oct 2020 21:05:27 +0100
Subject: [PATCH] Giving operator 1 second to startup.

---
 e2e/tests/k8s_api.py  | 6 +++++-
 e2e/tests/test_e2e.py | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py
index a3d7b156f..371fa8e0d 100644
--- a/e2e/tests/k8s_api.py
+++ b/e2e/tests/k8s_api.py
@@ -69,7 +69,10 @@ class K8s:
         return m, r
 
     def wait_for_operator_pod_start(self):
-        self. wait_for_pod_start("name=postgres-operator")        
+        self.wait_for_pod_start("name=postgres-operator")
+        # give operator time to subscribe to objects
+        time.sleep(1)
+        return True
 
     def get_operator_pod(self):
         pods = self.api.core_v1.list_namespaced_pod(
@@ -105,6 +108,7 @@ class K8s:
 
             time.sleep(self.RETRY_TIMEOUT_SEC)
 
+
     def get_service_type(self, svc_labels, namespace='default'):
         svc_type = ''
         svcs = self.api.core_v1.list_namespaced_service(namespace, label_selector=svc_labels, limit=1).items
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 3c491b2c0..0cb7d531b 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -860,6 +860,15 @@ class EndToEndTestCase(unittest.TestCase):
             print('Operator log: {}'.format(k8s.get_operator_log()))
             raise
 
+        #reset configmap
+        patch_delete_annotations = {
+            "data": {
+                "delete_annotation_date_key": "",
+                "delete_annotation_name_key": ""
+            }
+        }
+        k8s.update_config(patch_delete_annotations)
+
     def get_failover_targets(self, master_node, replica_nodes):
         '''
            If all pods live on the same node, failover will happen to other worker(s)