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

Merge branch 'feature/infrastructure-roles-extension' of github.com:zalando/postgres-operator into feature/infrastructure-roles-extension

This commit is contained in:
Felix Kunde 2020-08-02 18:39:47 +02:00
parent d6c686a70d 64646099e0
commit d4fee0da50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/tests/test_e2e.py
View File

@ -595,7 +595,7 @@ class EndToEndTestCase(unittest.TestCase):
# operator configuration via API # operator configuration via API
operator_pod = k8s.get_operator_pod() operator_pod = k8s.get_operator_pod()
get_config_cmd = "wget --quiet -O - localhost:8080/config" get_config_cmd = "wget --quiet -O - localhost:8080/config"
result = k8s.exec_with_kubectl(operator_pod, get_config_cmd) result = k8s.exec_with_kubectl(operator_pod.metadata.name, get_config_cmd)
roles_dict = (json.loads(result.stdout) roles_dict = (json.loads(result.stdout)
.get("controller", {}) .get("controller", {})
.get("InfrastructureRoles")) .get("InfrastructureRoles"))
@ -861,7 +861,7 @@ class K8s:
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
def exec_with_kubectl(self, pod, cmd): def exec_with_kubectl(self, pod, cmd):
return subprocess.run(["exec.sh", pod, cmd], return subprocess.run(["e2e/exec.sh", pod, cmd],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)