fix(helmbroker): avoid addonValues error

Author: jianxiaoguo

rootfs/helmbroker/tasks.py

@@ -30,7 +30,6 @@ def provision(instance_id: str, details: ProvisionDetails):
             ]
             helm(instance_id, *args)
         values_file = os.path.join(get_plan_path(instance_id), "values.yaml")
-        addon_values_file = dump_addon_values(details.service_id, instance_id)
         args = [
             "install",
             details.context["instance_name"],
@@ -42,12 +41,14 @@ def provision(instance_id: str, details: ProvisionDetails):
             "--timeout",
             "25m0s",
             "-f",
-            addon_values_file,
-            "-f",
             values_file,
             "--set",
             f"fullnameOverride=helmbroker-{details.context['instance_name']}"
         ]
+        addon_values_file = dump_addon_values(details.service_id, instance_id)
+        if addon_values_file:
+            args.insert(9, "-f")
+            args.insert(10, addon_values_file)
         logger.debug(f"helm install parameters :{details.parameters}")
         args = format_paras_to_helm_args(instance_id, details.parameters, args)
         logger.debug(f"helm install args:{args}")
@@ -83,7 +84,6 @@ def update(instance_id: str, details: UpdateDetails):
     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")
-    addon_values_file = dump_addon_values(details.service_id, instance_id)
     args = [
         "upgrade",
         details.context["instance_name"],
@@ -96,12 +96,14 @@ def update(instance_id: str, details: UpdateDetails):
         "25m0s",
         "--reuse-values",
         "-f",
-        addon_values_file,
-        "-f",
         values_file,
         "--set",
         f"fullnameOverride=helmbroker-{details.context['instance_name']}"
     ]
+    addon_values_file = dump_addon_values(details.service_id, instance_id)
+    if addon_values_file:
+        args.insert(10, "-f")
+        args.insert(11, addon_values_file)
     paras = data['details']['parameters']
     logger.debug(f"helm upgrade parameters: {paras}")
     args = format_paras_to_helm_args(instance_id, paras, args)

rootfs/helmbroker/utils.py

@@ -6,10 +6,12 @@
 import time
 import base64
 import copy
+import logging
 
 from jsonschema import validate
 from .config import INSTANCES_PATH, ADDONS_PATH, CONFIG_PATH
 
+logger = logging.getLogger(__name__)
 
 REGISTRY_CONFIG_SUFFIX = '.config/helm/registry.json'
 REPOSITORY_CACHE_SUFFIX = '.cache/helm/repository'
@@ -162,12 +164,19 @@ def dump_addon_values(service_id, instance_id):
     instance_path = get_instance_path(instance_id)
     file = f"{instance_path}/addon-values-{timestamp}.yaml"
     service = _get_addon_meta(service_id)
-    with open(file, "w") as f:
+    logger.debug(f"dump_addon_values service: {service}")
+    if not os.path.exists(f'{CONFIG_PATH}/addon-values'):
+        return None
+    with open(file, "w") as fw:
         with open(f'{CONFIG_PATH}/addon-values', 'r') as f:
-            addon_values = yaml.load(f.read(), Loader=yaml.Loader)
-            f.write(yaml.dump(
-                addon_values.get(service["name"], {}).get(service["version"], {})  # noqa
-            ))
+            addons_values = yaml.load(f.read(), Loader=yaml.Loader)
+            logger.debug(f"dump_addon_values addons_values: {addons_values}")
+            addon_values = addons_values.get(service["name"], {}).\
+                get(service["version"], {})
+            logger.debug(f"dump_addon_values addon_values: {addon_values}")
+            if not addon_values:
+                return None
+            fw.write(yaml.dump(addon_values))
     return file