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

fix cluster name label in e2e test

This commit is contained in:
Felix Kunde 2020-04-16 12:43:23 +02:00
parent aa12d6cf04
commit c48128cbcb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2e/tests/test_e2e.py
View File

@ -207,8 +207,8 @@ class EndToEndTestCase(unittest.TestCase):
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_lazy_spilo_upgrade(self): def test_lazy_spilo_upgrade(self):
''' '''
Test lazy upgrade for the Spilo image: operator changes a stateful set but lets pods run with the old image Test lazy upgrade for the Spilo image: operator changes a stateful set but lets pods run with the old image
until they are recreated for reasons other than operator's activity. That works because the operator uses until they are recreated for reasons other than operator's activity. That works because the operator uses
"onDelete" pod update policy for stateful sets. "onDelete" pod update policy for stateful sets.
The test covers: The test covers:
@ -230,13 +230,13 @@ class EndToEndTestCase(unittest.TestCase):
} }
k8s.update_config(patch_lazy_spilo_upgrade) k8s.update_config(patch_lazy_spilo_upgrade)
# restart the pod to get a container with the new image # restart the pod to get a container with the new image
k8s.api.core_v1.delete_namespaced_pod(pod0, "default") k8s.api.core_v1.delete_namespaced_pod(pod0, "default")
k8s.wait_for_running_pods('version=acid-minimal-cluster', 2) k8s.wait_for_running_pods('cluster-name=acid-minimal-cluster', 2)
# sanity check: restarted pod runs the image specified in operator's conf # sanity check: restarted pod runs the image specified in operator's conf
new_image = k8s.get_effective_pod_image(pod0) new_image = k8s.get_effective_pod_image(pod0)
self.assertEqual(conf_image, new_image, self.assertEqual(conf_image, new_image,
"Lazy upgrade failed: restarted pod runs image {} different from the one in operator conf {}".format(new_image, conf_image)) "Lazy upgrade failed: restarted pod runs image {} different from the one in operator conf {}".format(new_image, conf_image))
# lazy update works if the restarted pod and older pods have different Spilo versions # lazy update works if the restarted pod and older pods have different Spilo versions
@ -783,7 +783,7 @@ class K8s:
def get_effective_pod_image(self, pod_name, namespace = 'default'): def get_effective_pod_image(self, pod_name, namespace = 'default'):
''' '''
Get the Spilo image pod currently uses. In case of lazy rolling updates Get the Spilo image pod currently uses. In case of lazy rolling updates
it may differ from the one specified in the stateful set. it may differ from the one specified in the stateful set.
''' '''
pod = self.api.core_v1.list_namespaced_pod( pod = self.api.core_v1.list_namespaced_pod(