Merge pull request #38 from truenas/mrehan/ix-values

NAS-130323 / 24.10 / Make sure ix_values.yaml file is provided to compose rendering if it exists
truenas · Jul 30, 2024 · 945d831 · 945d831
2 parents 129a108 + ae1032c
commit 945d831
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/catalog_templating/scripts/render_compose.py b/catalog_templating/scripts/render_compose.py
@@ -16,7 +16,9 @@ def render_templates_from_path(app_path: str, values_file: str) -> None:
 
     verrors.check()
 
-    rendered_data = render_templates(app_path, get_values(values_file))
+    rendered_data = render_templates(
+        app_path, get_values(values_file) | get_values(os.path.join(app_path, 'ix_values.yaml'))
+    )
     write_template_yaml(app_path, rendered_data)