chore(helmbroker): add addonValues

Author: duanhongyi

charts/helmbroker/templates/helmbroker-cm.yaml

@@ -13,4 +13,6 @@ data:
     - name: {{ .name }}
       url: {{ .url }}
     {{- end }}
+  addon-values: |
+    {{- (tpl .Values.addonValues $)  | nindent 4 }}
 {{- end }}

charts/helmbroker/values.yaml

@@ -58,6 +58,9 @@ celery:
     extraMatchLabels:
       app: "drycc-helmbroker-celery"
 
+# Default override of addon values
+addonValues: {}
+
 persistence:
   enabled: true
   accessMode: ReadWriteMany

rootfs/helmbroker/tasks.py

@@ -10,7 +10,7 @@
 from .celery import app
 from .utils import get_plan_path, get_chart_path, get_cred_value, \
     InstanceLock, dump_instance_meta, dump_binding_meta, load_instance_meta, \
-    get_instance_file, helm, format_paras_to_helm_args
+    get_instance_file, helm, dump_addon_values, format_paras_to_helm_args
 
 logger = logging.getLogger(__name__)
 
@@ -30,6 +30,7 @@ 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"],
@@ -41,6 +42,8 @@ def provision(instance_id: str, details: ProvisionDetails):
             "--timeout",
             "25m0s",
             "-f",
+            addon_values_file,
+            "-f",
             values_file,
             "--set",
             f"fullnameOverride=helmbroker-{details.context['instance_name']}"
@@ -80,6 +83,7 @@ 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"],
@@ -92,6 +96,8 @@ 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']}"

rootfs/helmbroker/utils.py

@@ -8,7 +8,7 @@
 import copy
 
 from jsonschema import validate
-from .config import INSTANCES_PATH, ADDONS_PATH
+from .config import INSTANCES_PATH, ADDONS_PATH, CONFIG_PATH
 
 
 REGISTRY_CONFIG_SUFFIX = '.config/helm/registry.json'
@@ -43,7 +43,7 @@ def helm(instance_id, *args, output_type="text"):
         "--repository-config",
         os.path.join(instance_path, REPOSITORY_CONFIG_SUFFIX),
     ])
-    return command("helm", *args, output_type=output_type)
+    return command("helm", *new_args, output_type=output_type)
 
 
 INSTANCE_META_SCHEMA = {
@@ -102,6 +102,17 @@ def dump_raw_values(instance_id, data):
     return file
 
 
+def dump_addon_values(service_id, instance_id):
+    timestamp = time.time()
+    instance_path = get_instance_path(instance_id)
+    file = f"{instance_path}/addon-values-{timestamp}.yaml"
+    with open(file, "w") as f:
+        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_id, {})))
+    return file
+
+
 BINDING_META_SCHEMA = {
     "type": "object",
     "properties": {