fixup

Author: duanhongyi

rootfs/helmbroker/tasks.py

@@ -3,7 +3,7 @@
 import yaml
 
 from .utils import command, get_plan_path, get_chart_path, get_cred_value
-from .meta import dump_instance_meta, dump_binding_meta
+from .meta import dump_instance_meta, dump_binding_meta, load_instance_meta
 from openbrokerapi.service_broker import *
 
 
@@ -18,7 +18,7 @@ def provision(instance_id: str, details: ProvisionDetails):
         },
         "last_operation": {
             "state": OperationState.IN_PROGRESS,
-            "description": "%s in progress at %s" % (instance_id, time.time())
+            "description": "provision %s in progress at %s" % (instance_id, time.time())
         }
     }
     dump_instance_meta(instance_id, data)
@@ -40,10 +40,10 @@ def provision(instance_id: str, details: ProvisionDetails):
     status, output = command("helm", *args)
     if status != 0:
         data["last_operation"]["state"] = OperationState.FAILED
-        data["last_operation"]["description"] = output
+        data["last_operation"]["description"] = "provision error:\n%s" % output
     else:
         data["last_operation"]["state"] = OperationState.SUCCEEDED
-        data["last_operation"]["description"] = "succeeded at %s" % time.time()
+        data["last_operation"]["description"] = "provision succeeded at %s" % time.time()
 
 
 def bind(instance_id: str,
@@ -97,4 +97,21 @@ def bind(instance_id: str,
 
 
 def deprovision(instance_id: str, details: DeprovisionDetails):
-    pass
+    data = load_instance_meta(instance_id)
+    data["last_operation"]["state"] = OperationState.IN_PROGRESS
+    data["last_operation"]["description"] = "deprovision %s in progress at %s" % (instance_id, time.time())
+    dump_instance_meta(instance_id)
+    command(
+        "helm",
+        "uninstall",
+        data["details"]["context"]["instance_name"],
+        "--namespace",
+        data["details"]["context"]["namespace"],
+    )
+    status, output = command("kubectl", "delete", "ns", data["details"]["context"]["namespace"])
+    if status != 0:
+        data["last_operation"]["state"] = OperationState.FAILED
+        data["last_operation"]["description"] = "deprovision error:\n%s" % output
+    else:
+        data["last_operation"]["state"] = OperationState.SUCCEEDED
+        data["last_operation"]["description"] = "deprovision succeeded at %s" % time.time()