Add cloud provider to the dask config.json file (#2266)

src/_nebari/stages/kubernetes_services/__init__.py

@@ -376,6 +376,7 @@ class JupyterhubInputVars(schema.Base):
 class DaskGatewayInputVars(schema.Base):
     dask_worker_image: ImageNameTag = Field(alias="dask-worker-image")
     dask_gateway_profiles: Dict[str, Any] = Field(alias="dask-gateway-profiles")
+    cloud_provider: str = Field(alias="cloud-provider")
 
 
 class MonitoringInputVars(schema.Base):
@@ -518,6 +519,7 @@ def input_vars(self, stage_outputs: Dict[str, Dict[str, Any]]):
                 self.config.default_images.dask_worker
             ),
             dask_gateway_profiles=self.config.profiles.dict()["dask_worker"],
+            cloud_provider=cloud_provider,
         )
 
         monitoring_vars = MonitoringInputVars(

src/_nebari/stages/kubernetes_services/template/dask_gateway.tf

@@ -11,7 +11,6 @@ variable "dask-gateway-profiles" {
   description = "Dask Gateway profiles to expose to user"
 }
 
-
 # =================== RESOURCES =====================
 module "dask-gateway" {
   source = "./modules/kubernetes/services/dask-gateway"
@@ -39,4 +38,6 @@ module "dask-gateway" {
 
   # profiles
   profiles = var.dask-gateway-profiles
+
+  cloud-provider = var.cloud-provider
 }

src/_nebari/stages/kubernetes_services/template/jupyterhub.tf

@@ -65,11 +65,6 @@ variable "idle-culler-settings" {
   type        = any
 }
 
-variable "cloud-provider" {
-  description = "Name of cloud provider."
-  type        = string
-}
-
 module "kubernetes-nfs-server" {
   count = var.jupyterhub-shared-endpoint == null ? 1 : 0
 

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/files/gateway_config.py

@@ -115,12 +115,9 @@ def list_dask_environments():
 
 def base_node_group(options):
     key = config["worker-node-group"]["key"]
-    if config.provider.value == "aws":
+    if config.get("provider", "") == "aws":
         key = "dedicated"
-    default_node_group = {
-        key: config["worker-node-group"]["value"],
-        # config["worker-node-group"]["key"]: config["worker-node-group"]["value"],
-    }
+    default_node_group = {key: config["worker-node-group"]["value"]}
 
     # check `worker_extra_pod_config` first
     worker_node_group = (

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/gateway.tf

@@ -24,6 +24,7 @@ resource "kubernetes_secret" "gateway" {
       conda-store-api-token                = var.conda-store-api-token
       conda-store-service-name             = var.conda-store-service-name
       conda-store-namespace                = var.namespace
+      provider                             = var.cloud-provider
     })
   }
 }

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/variables.tf

@@ -199,3 +199,8 @@ variable "conda-store-service-name" {
   description = "internal service-name:port where conda-store can be reached"
   type        = string
 }
+
+variable "cloud-provider" {
+  description = "Name of the cloud provider to deploy to."
+  type        = string
+}

src/_nebari/stages/kubernetes_services/template/variables.tf

@@ -53,7 +53,13 @@ variable "jupyterlab-pioneer-log-format" {
   description = "Logging format for JupyterLab Pioneer"
   type        = string
 }
+
 variable "jhub-apps-enabled" {
   description = "Enable JupyterHub Apps"
   type        = bool
 }
+
+variable "cloud-provider" {
+  description = "Name of cloud provider."
+  type        = string
+}