From 317d0b1a0642c6751ac7ea4fde50b4f98846edd7 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine <57888439+jervine-gogo@users.noreply.github.com> Date: Wed, 16 Dec 2020 13:53:47 +0800 Subject: [PATCH] Fix rollback to use helm3 --- main.py | 4 ++-- routes/kube_helm_routes.py | 4 ++-- tables.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 1d31045..6c586d0 100644 --- a/main.py +++ b/main.py @@ -69,8 +69,8 @@ def get_chartdata(namespace, chart, records): revision["namespace"] = namespace return data -def chartRollback(ns, revision, chart): - command = "/usr/local/bin/helm -n " + ns + " rollback " + chart + " " + revision # helm2 +def chartRollback(revision, chart, ns): + command = "/usr/local/bin/helm -n " + ns + " rollback " + chart + " " + revision # helm3? info(f"Running command: {command}") try: output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8") diff --git a/routes/kube_helm_routes.py b/routes/kube_helm_routes.py index 54dc44a..3f3231b 100644 --- a/routes/kube_helm_routes.py +++ b/routes/kube_helm_routes.py @@ -29,7 +29,7 @@ def namespaceLookup(ns): charts = get_charts(ns) return jsonify(charts) -@routes.route('/deployChartRevision///', methods=['POST']) +@routes.route('/deployChartRevision///', methods=['POST']) def deployChartRevision(revision, chart, tiller_ns): - rollback = chartRollback(revision, chart, tiller_ns) + rollback = chartRollback(revision, chart, ns) return rollback \ No newline at end of file diff --git a/tables.py b/tables.py index 8b11938..773a91b 100644 --- a/tables.py +++ b/tables.py @@ -4,6 +4,7 @@ class chartVersionTable(Table): revision = Col('Chart Revision') updated = Col('Updated') status = Col('Status') + ns = Col('Namespace') chart = Col('Chart Version') description = Col('Description') - deploy = ButtonCol('Deploy', 'routes.deployChartRevision', url_kwargs=dict(revision='revision', chart='chartName', tiller_ns='tiller_ns'), button_attrs={"type" : "submit", "class" : "btn btn-danger"}) \ No newline at end of file + deploy = ButtonCol('Deploy', 'routes.deployChartRevision', url_kwargs=dict(revision='revision', chart='chartName', ns='ns'), button_attrs={"type" : "submit", "class" : "btn btn-danger"}) \ No newline at end of file