From 48505730b81a35f28feee791eb0ab0331ac00726 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 12 Feb 2021 14:19:35 +0100 Subject: [PATCH] update test_min_resource_limits --- e2e/tests/test_e2e.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 4988b1be2..7ce7a4c90 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -713,6 +713,7 @@ class EndToEndTestCase(unittest.TestCase): "min_memory_limit": minMemoryLimit } } + k8s.update_config(patch_min_resource_limits, "Minimum resource test") # lower resource limits below minimum pg_patch_resources = { @@ -730,10 +731,8 @@ class EndToEndTestCase(unittest.TestCase): } } k8s.api.custom_objects_api.patch_namespaced_custom_object( - "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources) - - k8s.patch_statefulset({"metadata": {"annotations": {"zalando-postgres-operator-rolling-update-required": "False"}}}) - k8s.update_config(patch_min_resource_limits, "Minimum resource test") + "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources) + self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync") self.eventuallyEqual(lambda: k8s.count_running_pods(), 2, "No two pods running after lazy rolling upgrade") self.eventuallyEqual(lambda: len(k8s.get_patroni_running_members()), 2, "Postgres status did not enter running") @@ -749,7 +748,6 @@ class EndToEndTestCase(unittest.TestCase): r = r and pods[1].spec.containers[0].resources.limits['cpu'] == minCPULimit return r - print('Operator log: {}'.format(k8s.get_operator_log())) self.eventuallyTrue(verify_pod_limits, "Pod limits where not adjusted") @classmethod