Merge pull request #42 from epics-containers/dev

added ioc_name and ioc_version to helm install cmds

Author: gilesknap

src/epics_containers_cli/ioc/helm.py

@@ -4,7 +4,6 @@
 from tempfile import mkdtemp
 from typing import Optional
 
-import jinja2
 import typer
 
 from epics_containers_cli.globals import BEAMLINE_CHART_FOLDER, CONFIG_FOLDER
@@ -42,7 +41,6 @@ def __init__(
         self.tmp = Path(mkdtemp())
 
         self.bl_chart_folder = self.tmp / BEAMLINE_CHART_FOLDER
-        self.jinja_path = self.bl_chart_folder / "Chart.yaml.jinja"
         self.bl_chart_path = self.bl_chart_folder / "Chart.yaml"
         self.bl_config_folder = self.bl_chart_folder / CONFIG_FOLDER
 
@@ -92,17 +90,12 @@ def deploy(self):
 
     def _do_deploy(self, config_folder: Path):
         """
-        Generate an on the fly chart using beamline chart with config folder
-        and generated Chart.yaml. Deploy the resulting helm chart to the cluster.
+        Generate an on the fly chart using beamline chart with config folder.
+        Deploy the resulting helm chart to the cluster.
         """
         # values.yaml is a peer to the config folder
         values_path = config_folder.parent / "values.yaml"
 
-        # render a Chart.yaml from the jinja template
-        template = jinja2.Template(self.jinja_path.read_text())
-        chart = template.render(ioc_name=self.ioc_name, ioc_version=self.version)
-        self.bl_chart_path.write_text(chart)
-
         # add the config folder to the helm chart
         self.bl_config_folder.symlink_to(config_folder)
 
@@ -124,7 +117,8 @@ def _install(
         cmd = (
             f"bash -c "
             f'"helm {helm_cmd} {self.ioc_name} {self.bl_chart_folder} '
-            f"--version {self.version} --namespace {self.namespace} -f {values}"
+            f"--version {self.version} --namespace {self.namespace} -f {values} "
+            f"--set ioc_name={self.ioc_name} --set ioc_version={self.version} "
             f" 2> >(grep -v 'found symbolic link' >&2)\""
         )
         if self.args:

src/epics_containers_cli/utils.py

@@ -40,11 +40,15 @@ def check_ioc_instance_path(ioc_path: Path, yes: bool = False):
     ioc_name = ioc_path.name.lower()
 
     log.info(f"checking IOC instance {ioc_name} at {ioc_path}")
-    if (
-        not (ioc_path / "values.yaml").exists()
-        or not (ioc_path / CONFIG_FOLDER).is_dir()
-    ):
-        log.error("ERROR: IOC instance requires values.yaml and config")
+    if ioc_path.is_dir():
+        if (
+            not (ioc_path / "values.yaml").exists()
+            or not (ioc_path / CONFIG_FOLDER).is_dir()
+        ):
+            log.error("IOC instance requires values.yaml and config")
+            raise typer.Exit(1)
+    else:
+        log.error(f"IOC instance path {ioc_path} does not exist")
         raise typer.Exit(1)
 
     return ioc_name, ioc_path