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

update signature for getting nodes of pg cluster

This commit is contained in:
Felix Kunde 2019-06-05 16:39:24 +02:00
parent 27276bd93a
commit 89163e7040
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/tests/test_e2e.py
View File

@ -97,10 +97,10 @@ class EndToEndTestCase(unittest.TestCase):
Add taint "postgres=:NoExecute" to node with master. This must cause a failover. Add taint "postgres=:NoExecute" to node with master. This must cause a failover.
""" """
k8s = self.k8s k8s = self.k8s
labels = 'version=acid-minimal-cluster' cluster_label = 'version=acid-minimal-cluster'
# get nodes of master and replica(s) (expected target of new master) # get nodes of master and replica(s) (expected target of new master)
current_master_node, failover_targets = k8s.get_spilo_nodes(labels) current_master_node, failover_targets = k8s.get_pg_nodes(cluster_label)
num_replicas = len(failover_targets) num_replicas = len(failover_targets)
# if all pods live on the same node, failover will happen to other worker(s) # if all pods live on the same node, failover will happen to other worker(s)
@ -128,7 +128,7 @@ class EndToEndTestCase(unittest.TestCase):
k8s.wait_for_master_failover(failover_targets) k8s.wait_for_master_failover(failover_targets)
k8s.wait_for_pod_start('spilo-role=replica') k8s.wait_for_pod_start('spilo-role=replica')
new_master_node, new_replica_nodes = k8s.get_spilo_nodes(labels) new_master_node, new_replica_nodes = k8s.get_pg_nodes(cluster_label)
self.assertNotEqual(current_master_node, new_master_node, self.assertNotEqual(current_master_node, new_master_node,
"Master on {} did not fail over to one of {}".format(current_master_node, failover_targets)) "Master on {} did not fail over to one of {}".format(current_master_node, failover_targets))
self.assertEqual(num_replicas, len(new_replica_nodes), self.assertEqual(num_replicas, len(new_replica_nodes),
@ -251,10 +251,10 @@ class K8s:
def __init__(self): def __init__(self):
self.api = K8sApi() self.api = K8sApi()
def get_spilo_nodes(self, pod_labels, namespace='default'): def get_pg_nodes(self, pg_cluster_name, namespace='default'):
master_pod_node = '' master_pod_node = ''
replica_pod_nodes = [] replica_pod_nodes = []
podsList = self.api.core_v1.list_namespaced_pod(namespace, label_selector=pod_labels) podsList = self.api.core_v1.list_namespaced_pod(namespace, label_selector=pg_cluster_name)
for pod in podsList.items: for pod in podsList.items:
if pod.metadata.labels.get('spilo-role') == 'master': if pod.metadata.labels.get('spilo-role') == 'master':
master_pod_node = pod.spec.node_name master_pod_node = pod.spec.node_name