Replace hub_type for dask_nodes now that there is no daskhub helm chart

2i2c-org · Nov 22, 2024 · fa08604 · fa08604
1 parent b92be1c
commit fa08604
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 152 deletions.
diff --git a/config/clusters/templates/common/cluster-entry.yaml b/config/clusters/templates/common/cluster-entry.yaml
@@ -2,7 +2,7 @@ hubs:
   - name: {{ hub_name }}
     display_name: {{ cluster_name }} {{ hub_name }}
     domain: {{ hub_name }}.{{ cluster_name }}.2i2c.cloud
-    helm_chart: {{ hub_type }}
+    helm_chart: "basehub"
     helm_chart_values_files:
       - common.values.yaml
       - {{ hub_name }}.values.yaml

diff --git a/config/clusters/templates/gcp/cluster.yaml b/config/clusters/templates/gcp/cluster.yaml
@@ -31,7 +31,7 @@ hubs: []
   #   # Tip: consider changing this to something more human friendly
   #   display_name: "{{ cluster_name }} - <hub_name>"
   #   domain: <hub_name>.{{ cluster_name }}.2i2c.cloud
-  #   helm_chart: {{ hub_type }}
+  #   helm_chart: basehub
   #   helm_chart_values_files:
   #     - common.values.yaml
   #     - <hub_name>.values.yaml

diff --git a/deployer/README.md b/deployer/README.md
@@ -260,7 +260,6 @@ for a GCP cluster.
     - `cluster_name` - the name of the cluster
     - `cluster_region`- the region where the cluster will be deployed
     - `project_id` - the project ID of the GCP project
-    - `hub_type` (basehub/daskhub) - whether the hub deployed there would need dask or not
     - `hub_name` - the name of the first hub which will be deployed in the cluster (usually `staging`)
 
 The templates have a set of default features and define some opinionated characteristics for the cluster.

diff --git a/deployer/commands/generate/dedicated_cluster/gcp.py b/deployer/commands/generate/dedicated_cluster/gcp.py
@@ -63,6 +63,10 @@ def gcp(
     project_id: str = typer.Option(
         ..., prompt="Please insert the Project ID of the GCP project"
     ),
+    dask_nodes: bool = typer.Option(
+        False,
+        prompt='If this cluster needs dask nodes, please type "y", otherwise hit ENTER.',
+    ),
     force: bool = typer.Option(
         False,
         "--force",
@@ -79,7 +83,7 @@ def gcp(
         # Also store the provider, as it's useful for some jinja templates
         # to differentiate between them when rendering the configuration
         "provider": "gcp",
-        "hub_type": "basehub",
+        "dask_nodes": dask_nodes,
         "cluster_name": cluster_name,
         "cluster_region": cluster_region,
         "project_id": project_id,

diff --git a/deployer/commands/generate/hub_asset/cluster_entry.py b/deployer/commands/generate/hub_asset/cluster_entry.py
@@ -18,7 +18,6 @@ def cluster_entry(
     """
 
     vars = {
-        "hub_type": "basehub",
         "cluster_name": cluster_name,
         "hub_name": hub_name,
     }

diff --git a/eksctl/Udder-Cranberry1-Various b/eksctl/Udder-Cranberry1-Various
diff --git a/eksctl/ubc-eoas copy.jsonnet b/eksctl/ubc-eoas copy.jsonnet
diff --git a/terraform/gcp/projects/cluster.tfvars.template b/terraform/gcp/projects/cluster.tfvars.template
@@ -78,7 +78,7 @@ notebook_nodes = {
   }
 }
 
-{% if hub_type == "daskhub" %}
+{% if dask_nodes == "daskhub" %}
 dask_nodes = {
 #  A not yet fully established policy is being developed about using a single
 #  node pool, see https://github.com/2i2c-org/infrastructure/issues/2687.