Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'kubernetes-fix' into kubernetes-improvment

This commit is contained in:
Wesley Hartford 2018-12-18 22:26:03 -05:00
parent bc621c1468 e7313da03e
commit 073d05ae21
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lemur/plugins/lemur_kubernetes/plugin.py
View File

@ -34,14 +34,8 @@ def ensure_resource(k8s_api, k8s_base_uri, namespace, kind, name, data):
if 200 <= create_resp.status_code <= 299: if 200 <= create_resp.status_code <= 299:
return None return None
elif create_resp.json().get('reason', '') != 'AlreadyExists':
else: return create_resp.content
json = create_resp.json()
if 'reason' in json:
if json['reason'] != 'AlreadyExists':
return create_resp.content
else:
return create_resp.content
url = _resolve_uri(k8s_base_uri, namespace, kind, name) url = _resolve_uri(k8s_base_uri, namespace, kind, name)
current_app.logger.debug("K8S PUT request URL: %s", url) current_app.logger.debug("K8S PUT request URL: %s", url)
@ -52,7 +46,7 @@ def ensure_resource(k8s_api, k8s_base_uri, namespace, kind, name, data):
if not 200 <= update_resp.status_code <= 299: if not 200 <= update_resp.status_code <= 299:
return update_resp.content return update_resp.content
return None return
def _resolve_ns(k8s_base_uri, namespace, api_ver=DEFAULT_API_VERSION): def _resolve_ns(k8s_base_uri, namespace, api_ver=DEFAULT_API_VERSION):
@ -227,8 +221,8 @@ class KubernetesDestinationPlugin(DestinationPlugin):
) )
except Exception as e: except Exception as e:
current_app.logger.exception("Exception in upload") current_app.logger.exception("Exception in upload: {}".format(e), exc_info=True)
raise e raise
if err is not None: if err is not None:
current_app.logger.debug("Error deploying resource: %s", err) current_app.logger.debug("Error deploying resource: %s", err)