alihan/microk8s
1
0
Fork 0
mirror of https://github.com/ubuntu/microk8s.git synced 2021-05-23 02:23:41 +03:00
Code Issues Projects Releases Wiki Activity

Use requests and not curl to delete node

Browse Source
This commit is contained in:
Konstantinos
2020-05-28 23:36:30 +03:00
committed by Konstantinos Tsakalozos
parent a665a651d4
commit 706e72e367
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/cluster/join.py
View File

@@ -387,12 +387,16 @@ def delete_dqlite_node(delete_node, dqlite_ep):
if len(delete_node) > 0 and "127.0.0.1" not in delete_node[0]:
for ep in dqlite_ep:
try:
subprocess.check_output("curl -X DELETE https://{}/cluster/{} --cacert {} --key {} --cert {} -k -s"
.format(ep, delete_node[0], cluster_cert_file, cluster_key_file, cluster_cert_file)
.split())
break
except subprocess.CalledProcessError:
print("Contacting node {} failed.".format(ep))
url = 'https://{}/cluster/{}'.format(ep, delete_node[0])
resp = requests.delete(url, cert=(cluster_cert_file, cluster_key_file), verify=False)
if resp.status_code != 200:
print("Contacting node {} failed. Exit code {}.".format(ep, resp.status_code))
exit(2)
else:
break
except Exception as err:
print("Contacting node {} failed. Error:".format(ep))
print(repr(err))
exit(2)