From f2187c6fc5ba7a3716b336e4f702d35ad8cdcdf7 Mon Sep 17 00:00:00 2001 From: jenkins-x-bot Date: Tue, 15 Sep 2020 16:39:43 +0800 Subject: [PATCH] Added helm rollback code --- main.py | 12 ++++++++++++ routes/.kube_helm_routes.py.swp | Bin 0 -> 12288 bytes routes/kube_helm_routes.py | 6 +++--- tables.py | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 routes/.kube_helm_routes.py.swp diff --git a/main.py b/main.py index a4682f7..dd746ee 100644 --- a/main.py +++ b/main.py @@ -77,9 +77,21 @@ def get_chartdata(tiller_ns, namespace, chart): info(f"Output from command:\n{output}") data = json.loads(output) for revision in data: + revision['chartName'] = chart revision["namespace"] = namespace revision["tiller_ns"] = tiller_ns return data +def chartRollback(revision, chart, tiller_ns) + command = "/usr/local/bin/helm --tiller-namespace " + tiller_ns + " rollback " + chart + revision # helm2 + info(f"Running command: {command}") + try: + output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8") + except CalledProcessError as err: + error(err.output.decode("utf-8")) + raise err + info(f"Output from command:\n{output}") + return output + if __name__ == "__main__": app.run(host='0.0.0.0', port=3000, debug=True) diff --git a/routes/.kube_helm_routes.py.swp b/routes/.kube_helm_routes.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..9641b8addbed6c11375fc5e53c3bd8222a2863b9 GIT binary patch literal 12288 zcmeI2&ui2`6vwAU!C$SSCvWj*wy;gAUPN3KioZZn+S<#qtl8aJH*S)NGZS&a*0XpM z1dqM?S9nr9c+`W4C;tNf1K<3}H0`d`tM&!HJDHc4nfE^PW}q~kh1J`4y^FyDf$In% zFV`NngICk!>K;NKvn(4a`wkaNMrmG%9lQux*8_$FDr6jmk7607qqdMmzaRFKNDSxm zksPpWen6A-e8^cLsR)NfhqjfaZ45#FHzDm93pyZyT}7af{rQVCYoN2BGoaI;Uk3>J2zm=z13d>F z2YrLMHb5%A*D6N5kN^@u0!RP}AOR%s9}w{1;#AtE;F-r+l60c(&?DMd_8MMy5OKL= z`!!CV#v*1}-Pr4%jFW`&b|&UXkM_MD%@a0S)bCi=@prN)r6P~IwEFrba?O5jshgS~ zP8ch^Tn2C@ysRUG)(r>uE}ScV-AgHa+}RV2rhot5@`~S@BPKa2RmP76%i{j1riX#> zRo>>_Yj}^SY@1Ha4O#cxOeR^^y~EhB$R~S_=amWLUyZh!g%5F71LZX90b)thJc%T& z`8u#Ai}y|}WH69v0tw5glhB6#tpwX}ahfFc^PmggzX~cK*QT#6^Fs1Cr#%?Q8oCT7 z&P3HTU{5LcTRJ>5PKR-b4u)Cb1>LlRL5I0YxvG~H6`4V8Emh*BsS3Uq$!H=`TY8lR zgV#8HQou*PL7(xoX#kZ`mIXTIaPCWlotCy2p# z0~pi{4o5;&zuM`W2J7L*wGL&!Jh))dbs@yCL7q)2fGw+j^ZJU~RPGRp)0}as4GzQ&2uP$D}c)5v+lIZ)+y?${AL#K4Ri5=`0=0}Tvh6&r Ui~5qj3}Ra~*UOz*FV9=@8w>n|e*gdg literal 0 HcmV?d00001 diff --git a/routes/kube_helm_routes.py b/routes/kube_helm_routes.py index 2226d09..3cc2fce 100644 --- a/routes/kube_helm_routes.py +++ b/routes/kube_helm_routes.py @@ -1,6 +1,6 @@ from flask import render_template, request, jsonify from forms import deploySelectForm -from main import get_namespaces, get_charts, get_chartdata, get_tiller_namespaces +from main import get_namespaces, get_charts, get_chartdata, get_tiller_namespaces, chartRollback from . import routes from tables import chartVersionTable import json @@ -33,5 +33,5 @@ def namespaceLookup(tiller_ns, namespace): @routes.route('/deployChartRevision////', methods=['POST']) def deployChartRevision(revision, chart, namespace, tiller_ns): - charts = get_charts(tiller_ns, namespace) - return jsonify(charts) + rollback = chartRollback(revision, chart, tiller_ns) + return rollback diff --git a/tables.py b/tables.py index 9119f9b..b15ebcc 100644 --- a/tables.py +++ b/tables.py @@ -8,4 +8,4 @@ class chartVersionTable(Table): tiller_ns = Col('Tiiler Namespace') chart = Col('Chart Version') description = Col('Description') - deploy = ButtonCol('Deploy', 'routes.deployChartRevision', url_kwargs=dict(revision='revision', chart='chart', namespace='namespace', tiller_ns='tiller_ns'), button_attrs={"type" : "submit", "class" : "btn btn-danger"}) + deploy = ButtonCol('Deploy', 'routes.deployChartRevision', url_kwargs=dict(revision='revision', chart='chartName', namespace='namespace', tiller_ns='tiller_ns'), button_attrs={"type" : "submit", "class" : "btn btn-danger"})