chore(helmbroker): fixup binding

Author: lijianguo

rootfs/helmbroker/broker.py

@@ -66,21 +66,20 @@ def bind(self,
              async_allowed: bool,
              **kwargs
              ) -> Binding:
-        is_addon_bindable = get_addon_bindable(instance_id)
+        is_addon_bindable = get_addon_bindable(details.service_id)
         if not is_addon_bindable:
             raise ErrBadRequest(msg="Instance %s does not bindable" % instance_id)  # noqa
         instance_meta = load_instance_meta(instance_id)
         if not (instance_meta and
                 instance_meta['last_operation']['state'] == 'succeeded'):
             raise ErrBadRequest(msg="This instance %s is not ready" % instance_id)  # noqa
-        if not async_allowed:
-            raise ErrAsyncRequired()
+        # if not async_allowed:
+        #     raise ErrAsyncRequired()
         instance_path = get_instance_path(instance_id)
         if os.path.exists(f'{instance_path}/bind.yaml'):
             raise ErrBindingAlreadyExists()
         chart_path, plan_path = get_chart_path(instance_id), get_plan_path(instance_id)  # noqa
-        # addon_name = get_addon_name(details.service_id)
-        shutil.copy(f'{plan_path}/bind.yaml', f'{chart_path}/templates')  # noqa
+        shutil.copy(f'{plan_path}/bind.yaml', f'{chart_path}/templates')
         bind.delay(instance_id, binding_id, details, async_allowed, **kwargs)
         return Binding(state=BindState.IS_ASYNC)
 
@@ -92,8 +91,8 @@ def unbind(self,
                **kwargs
                ) -> UnbindSpec:
         instance_path = get_instance_path(instance_id)
-        bind_yaml = f'{instance_path}/bind.yaml'
-        shutil.rmtree(bind_yaml, ignore_errors=True)
+        binding_info = f'{instance_path}/binding.json'
+        shutil.rmtree(binding_info, ignore_errors=True)
         return UnbindSpec(is_async=False)
 
     def update(self,

rootfs/helmbroker/tasks.py

@@ -7,7 +7,6 @@
     UpdateDetails, BindDetails
 
 from .celery import app
-from .config import INSTANCES_PATH
 from .utils import command, get_plan_path, get_chart_path, get_cred_value
 from .meta import dump_instance_meta, dump_binding_meta, load_instance_meta
 
@@ -124,7 +123,9 @@ def bind(instance_id: str,
         details.context["instance_name"],
         chart_path,
         "-f",
-        values_file
+        values_file,
+        "--set",
+        f"fullnameOverride={details.context['instance_name']}"
     ]
     status, templates = command("helm", *args)  # output: templates.yaml
     if status != 0:
@@ -135,11 +136,12 @@ def bind(instance_id: str,
     success_flag = True
     errors = []
     for _ in credential_template['credential']:
-        status, val = get_cred_value(details.context["namespace"], _['ValueFrom'])  # noqa
+        status, val = get_cred_value(details.context["namespace"], _['valueFrom'])  # noqa
         if status != 0:
             success_flag = False
             errors.append(val)
-        data[_['name']] = val
+        else:
+            data['credential'][_['name']] = val
     if success_flag:
         data['last_operation'] = {
             'state': OperationState.SUCCEEDED.value,
@@ -151,6 +153,8 @@ def bind(instance_id: str,
             'description': "binding %s failed: %s" % (instance_id, ','.join(errors))  # noqa
         }
     dump_binding_meta(instance_id, data)
+    bind_yaml = f'{chart_path}/templates/bind.yaml'
+    shutil.rmtree(bind_yaml, ignore_errors=True)
 
 
 @app.task()

rootfs/helmbroker/utils.py

@@ -62,25 +62,25 @@ def get_cred_value(ns, source):
         return get_config_map_key_value(ns, source['configMapRef'])
     if source.get('secretKeyRef'):
         return get_secret_key_value(ns, source['secretKeyRef'])
-    return -1, 'invalid ValueFrom'
+    return -1, 'invalid valueFrom'
 
 
 def get_service_key_value(ns, service_ref):
     args = [
-        "get", "svc", service_ref['name'], "-n", ns, '-o', f'jsonpath="{service_ref["jsonpath"]}"', # noqa
+        "get", "svc", service_ref['name'], "-n", ns, '-o', f"jsonpath=\'{service_ref['jsonpath']}\'", # noqa
     ]
     return command("kubectl", *args)
 
 
 def get_config_map_key_value(ns, config_map_ref):
     args = [
-        "get", "cm", config_map_ref['name'], "-n", ns, '-o', f'jsonpath="{config_map_ref["jsonpath"]}"', # noqa
+        "get", "cm", config_map_ref['name'], "-n", ns, '-o', f"jsonpath=\'{config_map_ref['jsonpath']}\'", # noqa
     ]
     return command("kubectl", *args)
 
 
 def get_secret_key_value(ns, secret_ref):
     args = [
-        "get", "secret", secret_ref['name'], "-n", ns, '-o', f'jsonpath="{secret_ref["jsonpath"]}"', # noqa
+        "get", "secret", secret_ref['name'], "-n", ns, '-o', f"jsonpath=\'{secret_ref['jsonpath']}\'", # noqa
     ]
     return command("kubectl", *args)