public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge with master

This commit is contained in:
Felix Kunde 2020-08-13 18:00:25 +02:00
parent 55ffca6821
commit baedeaf37c
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
e2e/tests/test_e2e.py
View File

@ -684,53 +684,58 @@ class EndToEndTestCase(unittest.TestCase):
} }
k8s.update_config(patch_delete_annotations) k8s.update_config(patch_delete_annotations)
# this delete attempt should be omitted because of missing annotations try:
k8s.api.custom_objects_api.delete_namespaced_custom_object( # this delete attempt should be omitted because of missing annotations
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster") k8s.api.custom_objects_api.delete_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster")
# check that pods and services are still there # check that pods and services are still there
k8s.wait_for_running_pods(cluster_label, 2) k8s.wait_for_running_pods(cluster_label, 2)
k8s.wait_for_service(cluster_label) k8s.wait_for_service(cluster_label)
# recreate Postgres cluster resource # recreate Postgres cluster resource
k8s.create_with_kubectl("manifests/minimal-postgres-manifest.yaml") k8s.create_with_kubectl("manifests/minimal-postgres-manifest.yaml")
# wait a little before proceeding # wait a little before proceeding
time.sleep(10) time.sleep(10)
# add annotations to manifest # add annotations to manifest
deleteDate = datetime.today().strftime('%Y-%m-%d') deleteDate = datetime.today().strftime('%Y-%m-%d')
pg_patch_delete_annotations = { pg_patch_delete_annotations = {
"metadata": { "metadata": {
"annotations": { "annotations": {
"delete-date": deleteDate, "delete-date": deleteDate,
"delete-clustername": "acid-minimal-cluster", "delete-clustername": "acid-minimal-cluster",
}
} }
} }
} k8s.api.custom_objects_api.patch_namespaced_custom_object(
k8s.api.custom_objects_api.patch_namespaced_custom_object( "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_delete_annotations)
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_delete_annotations)
# wait a little before proceeding # wait a little before proceeding
time.sleep(10) time.sleep(10)
k8s.wait_for_running_pods(cluster_label, 2) k8s.wait_for_running_pods(cluster_label, 2)
k8s.wait_for_service(cluster_label) k8s.wait_for_service(cluster_label)
# now delete process should be triggered # now delete process should be triggered
k8s.api.custom_objects_api.delete_namespaced_custom_object( k8s.api.custom_objects_api.delete_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster") "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster")
# wait until cluster is deleted # wait until cluster is deleted
time.sleep(120) time.sleep(120)
# check if everything has been deleted # check if everything has been deleted
self.assertEqual(0, k8s.count_pods_with_label(cluster_label)) self.assertEqual(0, k8s.count_pods_with_label(cluster_label))
self.assertEqual(0, k8s.count_services_with_label(cluster_label)) self.assertEqual(0, k8s.count_services_with_label(cluster_label))
self.assertEqual(0, k8s.count_endpoints_with_label(cluster_label)) self.assertEqual(0, k8s.count_endpoints_with_label(cluster_label))
self.assertEqual(0, k8s.count_statefulsets_with_label(cluster_label)) self.assertEqual(0, k8s.count_statefulsets_with_label(cluster_label))
self.assertEqual(0, k8s.count_deployments_with_label(cluster_label)) self.assertEqual(0, k8s.count_deployments_with_label(cluster_label))
self.assertEqual(0, k8s.count_pdbs_with_label(cluster_label)) self.assertEqual(0, k8s.count_pdbs_with_label(cluster_label))
self.assertEqual(0, k8s.count_secrets_with_label(cluster_label)) self.assertEqual(0, k8s.count_secrets_with_label(cluster_label))
except timeout_decorator.TimeoutError:
print('Operator log: {}'.format(k8s.get_operator_log()))
raise
def get_failover_targets(self, master_node, replica_nodes): def get_failover_targets(self, master_node, replica_nodes):
''' '''