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

Minor changes around running pods and catching error in infrastructure roles.

This commit is contained in:
Jan Mußler 2020-10-22 16:12:12 +02:00
parent 1f3730b2b4
commit 2aeaad03f3
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/tests/k8s_api.py
View File

@ -60,7 +60,9 @@ class K8s:
'default', label_selector='name=postgres-operator' 'default', label_selector='name=postgres-operator'
).items ).items
if pods: pods = list(filter(lambda x: x.status.phase=='Running', pods))
if len(pods):
return pods[0] return pods[0]
return None return None

43
e2e/tests/test_e2e.py
View File

@ -284,28 +284,31 @@ class EndToEndTestCase(unittest.TestCase):
# operator configuration via API # operator configuration via API
def verify_role(): def verify_role():
operator_pod = k8s.get_operator_pod()
get_config_cmd = "wget --quiet -O - localhost:8080/config"
result = k8s.exec_with_kubectl(operator_pod.metadata.name, get_config_cmd)
try: try:
roles_dict = (json.loads(result.stdout) operator_pod = k8s.get_operator_pod()
.get("controller", {}) get_config_cmd = "wget --quiet -O - localhost:8080/config"
.get("InfrastructureRoles")) result = k8s.exec_with_kubectl(operator_pod.metadata.name, get_config_cmd)
except: try:
return False roles_dict = (json.loads(result.stdout)
.get("controller", {})
.get("InfrastructureRoles"))
except:
return False
if "robot_zmon_acid_monitoring_new" in roles_dict: if "robot_zmon_acid_monitoring_new" in roles_dict:
role = roles_dict["robot_zmon_acid_monitoring_new"] role = roles_dict["robot_zmon_acid_monitoring_new"]
role.pop("Password", None) role.pop("Password", None)
self.assertDictEqual(role, { self.assertDictEqual(role, {
"Name": "robot_zmon_acid_monitoring_new", "Name": "robot_zmon_acid_monitoring_new",
"Flags": None, "Flags": None,
"MemberOf": ["robot_zmon"], "MemberOf": ["robot_zmon"],
"Parameters": None, "Parameters": None,
"AdminRole": "", "AdminRole": "",
"Origin": 2, "Origin": 2,
}) })
return True return True
except:
pass
return False return False