Merge pull request #1 from silogen/fix/z2jh-chart

Fix Z2JH version

Author: johannes-graner

codehub/cli/helm/create.py

@@ -50,7 +50,7 @@ def admin_to_yaml_str(admin):
 
     __add_config_content(hub_deploy_dir, template_fp, placeholder_replacements)
 
-    __download_helm_chart(helm_deploy_dir)
+    __add_helm_chart_config(helm_deploy_dir)
 
 
 def __get_config_fps(https=None, oauth=None):
@@ -91,40 +91,9 @@ def __build_template(hub_deploy_dir, config_fps):
     return output_fp
 
 
-def __download_helm_chart(helm_deploy_dir):
+def __add_helm_chart_config(helm_deploy_dir):
     load_dotenv()
 
-    repo_template_fp = os.path.join(STRUCTURE["templates"]["helm"], "repo.yaml")
-    repo_deploy_fp = os.path.join(helm_deploy_dir, "repo.yaml")
+    repo_template_fp = os.path.join(STRUCTURE["templates"]["helm"], "chart.yaml")
+    repo_deploy_fp = os.path.join(helm_deploy_dir, "chart.yaml")
     copy_file(repo_template_fp, repo_deploy_fp)
-
-    k8s_conf = read_yaml(repo_deploy_fp)
-    jupyterhub_url = k8s_conf["url"]
-    k8s_hash = k8s_conf["hash"]
-
-    jupyterhub_repo = os.path.join(helm_deploy_dir, "jupyterhub_repo")
-    helm_chart = os.path.join(helm_deploy_dir, "helm-chart")
-
-    cmds = [
-        ["git", "clone", jupyterhub_url, jupyterhub_repo],
-        ["cd", jupyterhub_repo, "&&", "git", "reset", "--hard", k8s_hash],
-        ["mv", os.path.join(jupyterhub_repo, "jupyterhub"), helm_chart],
-        ["rm", "-rf", os.path.join(jupyterhub_repo)],
-    ]
-
-    for cmd in cmds:
-        run_cmd(cmd)
-
-    files_to_replace = ["Chart.yaml", "values.yaml"]
-    for fn in files_to_replace:
-        fp = os.path.join(helm_chart, fn)
-        with open(fp) as f:
-            newText = (
-                f.read()
-                .replace("set.by.chartpress", "2.0.0")
-                .replace("set-by-chartpress", "2.0.0")
-            )
-        with open(fp, "w") as f:
-            f.write(newText)
-
-    return helm_chart

codehub/cli/helm/install.py

@@ -18,21 +18,15 @@ def upgrade_helm_chart(cluster_name, region, helm_deploy_dir, hub_deploy_dir):
 def __upgrade_or_install_helm_chart(
     cluster_name, region, helm_deploy_dir, hub_deploy_dir, upgrade=False
 ):
-    install_template_fp = os.path.join(STRUCTURE["templates"]["helm"], "install.yaml")
-    install_deploy_fp = os.path.join(helm_deploy_dir, "install.yaml")
+    chart_template_fp = os.path.join(STRUCTURE["templates"]["helm"], "chart.yaml")
+    chart_deploy_fp = os.path.join(helm_deploy_dir, "chart.yaml")
 
     placeholder_replacements = dict(REGION=region)
-    fill_file_placeholders(
-        install_template_fp, install_deploy_fp, placeholder_replacements
-    )
-
-    helm = read_yaml(install_deploy_fp)
+    fill_file_placeholders(chart_template_fp, chart_deploy_fp, placeholder_replacements)
 
-    chart_release = helm["release"]
-    cluster_namespace = helm["namespace"]
-    region = helm["region"]
-
-    helm_chart = os.path.join(helm_deploy_dir, "helm-chart")
+    helm_config = read_yaml(chart_deploy_fp)
+    repo_config = helm_config["repo"]
+    install_config = helm_config["install"]
 
     config_file = os.path.join(hub_deploy_dir, "config.yaml")
 
@@ -43,40 +37,34 @@ def __upgrade_or_install_helm_chart(
             "container",
             "clusters",
             "get-credentials",
-            f"--location={region}",
+            f"--location={install_config['region']}",
             cluster_name,
         ]
     )
 
-    if upgrade:
-        cmds.append(
-            [
-                "helm",
-                "upgrade",
-                "--cleanup-on-fail",
-                chart_release,
-                helm_chart,
-                "--namespace",
-                cluster_namespace,
-                "--values",
-                config_file,
-            ]
-        )
-    else:
-        cmds.append(
-            [
-                "helm",
-                "upgrade",
-                "--cleanup-on-fail",
-                "--install",
-                chart_release,
-                helm_chart,
-                "--namespace",
-                cluster_namespace,
-                "--values",
-                config_file,
-            ]
-        )
+    # Add and update Helm repo
+    cmds.append(["helm", "repo", "add", repo_config["repo_name"], repo_config["url"]])
+    cmds.append(["helm", "repo", "update"])
+
+    # Main helm command
+    helm_command = [
+        "helm",
+        "upgrade",
+        "--cleanup-on-fail",
+    ]
+    if not upgrade:
+        helm_command.append("--install")
+    helm_command += [
+        install_config["release"],
+        f"{repo_config['repo_name']}/{install_config['chart_name']}",
+        "--namespace",
+        install_config["namespace"],
+        "--version",
+        install_config["chart_version"],
+        "--values",
+        config_file,
+    ]
+    cmds.append(helm_command)
 
     for cmd in cmds:
         run_cmd(cmd)

codehub/templates/helm/chart.yaml

@@ -0,0 +1,9 @@
+repo:
+  url: https://hub.jupyter.org/helm-chart/
+  repo_name: jupyterhub
+install:
+  release: jhub
+  namespace: jhub
+  region: {{REGION}}
+  chart_name: jupyterhub
+  chart_version: 4.2.0