Merge branch 'main' of github.com:drycc/helmbroker into main

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -7,8 +7,8 @@
 
 from .meta import load_instance_meta, load_binding_meta, dump_binding_meta
 from .utils import get_instance_path, get_chart_path, get_plan_path, \
-    get_addon_path, get_addon_name
-from .tasks import provision, bind, deprovision
+    get_addon_path, get_addon_name, get_addon_updateable
+from .tasks import provision, bind, deprovision, update
 from helmbroker.loader import read_addons_file
 
 
@@ -88,8 +88,22 @@ def update(self,
                async_allowed: bool,
                **kwargs
                ) -> UpdateServiceSpec:
-        # Update service instnce
-        return ProvisionedServiceSpec()
+        instance_path = get_instance_path(instance_id)
+        if not os.path.exists(instance_path):
+            raise ErrBadRequest("Instance %s does not exist" % instance_id)
+        is_plan_updateable = get_addon_updateable(instance_id)
+        if not is_plan_updateable:
+            raise ErrBadRequest("Instance %s does not updateable" % instance_id)
+        if not async_allowed:
+            raise ErrAsyncRequired()
+        plan_path = get_plan_path(instance_id)
+        # delete the pre plan
+        shutil.rmtree(plan_path)
+        _, addon_plan_path = get_addon_path(details.service_id, details.plan_id)
+        # add the new plan
+        shutil.copy(addon_plan_path, plan_path)
+        update.delay(instance_id, details)
+        return UpdateServiceSpec(is_async=True)
 
     def deprovision(self,
                     instance_id: str,
@@ -103,7 +117,7 @@ def deprovision(self,
             raise ErrAsyncRequired()
 
         deprovision.delay(instance_id, details)
-        return DeprovisionServiceSpec(state=ProvisionState.IS_ASYNC)
+        return DeprovisionServiceSpec(is_async=True)
 
     def last_operation(self,
                        instance_id: str,

rootfs/helmbroker/tasks.py

@@ -46,6 +46,45 @@ def provision(instance_id: str, details: ProvisionDetails):
         data["last_operation"]["description"] = "provision succeeded at %s" % time.time()
 
 
+def update(instance_id: str, details: UpdateDetails):
+    data = {
+        "id": instance_id,
+        "details": {
+            "service_id": details.service_id,
+            "plan_id" : details.plan_id,
+            "context" : details.context,
+            "parameters": details.parameters,
+        },
+        "last_operation": {
+            "state": OperationState.IN_PROGRESS,
+            "description": "%s in progress at %s" % (instance_id, time.time())
+        }
+    }
+    dump_instance_meta(instance_id, data)
+    chart_path = get_chart_path(instance_id)
+    values_file = os.path.join(get_plan_path(instance_id), "values.yaml")
+    args = [
+        "upgrade",
+        details.context["instance_name"],
+        chart_path,
+        "--namespace",
+        details.context["namespace"],
+        "--create-namespace",
+        "--wait",
+        "--timeout 30m0s"
+        "-f",
+        values_file
+    ]
+
+    status, output = command("helm", *args)
+    if status != 0:
+        data["last_operation"]["state"] = OperationState.FAILED
+        data["last_operation"]["description"] = output
+    else:
+        data["last_operation"]["state"] = OperationState.SUCCEEDED
+        data["last_operation"]["description"] = "succeeded at %s" % time.time()
+
+
 def bind(instance_id: str,
          binding_id: str,
          details: BindDetails,

rootfs/helmbroker/utils.py

@@ -33,13 +33,23 @@ def get_addon_path(service_id, plan_id):
     return service_path, plan_path
 
 
-def get_addon_name(service_id):
+def get_addon_meta(service_id):
     services = read_addons_file()
     service = [addon for addon in [addons for _, addons in services.items()]
                if addon['id'] == service_id][0]
+    return service
+
+
+def get_addon_name(service_id):
+    service = get_addon_meta(service_id)
     return service['name']
 
 
+def get_addon_updateable(service_id):
+    service = get_addon_meta(service_id)
+    return service.get('plan_updateable', False)
+
+
 def get_cred_value(ns, source):
     if source.get('serviceRef'):
         return get_service_key_value(ns, source['serviceRef'])