Ensure ns exists before delete while cleaning up

Change-Id: I3373ede5293ca0401acd9605f244bbe6abf998f1
This commit is contained in:
Sergey Lukjanov 2016-08-29 22:58:22 -07:00
parent b282b4d3ca
commit cd2b4c55f3
1 changed files with 10 additions and 1 deletions

View File

@ -151,8 +151,17 @@ def _wait_for_namespace_delete(k8s_api):
def _cleanup_kubernetes_objects():
LOG.info('Starting Kubernetes objects cleanup')
k8s_api = kubernetes.get_v1_api(kubernetes.get_client())
try:
k8s_api.read_namespaced_namespace(CONF.kubernetes.namespace)
except rest.ApiException as e:
if e.status == 404:
LOG.info('Kubernetes namespace not found')
return
raise e
LOG.info('Starting Kubernetes objects cleanup')
k8s_api.delete_namespaced_namespace({}, CONF.kubernetes.namespace)
_wait_for_namespace_delete(k8s_api)
LOG.info('Kubernetes objects cleanup has been finished successfully.')