From 8f7d933da6b9aaf1f71daa58d67525e4d5592282 Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Tue, 20 Feb 2024 12:29:25 -0500 Subject: [PATCH] Move duplicate variable to variables.tf --- .../stages/kubernetes_services/template/dask_gateway.tf | 6 ------ .../stages/kubernetes_services/template/jupyterhub.tf | 5 ----- .../stages/kubernetes_services/template/variables.tf | 6 ++++++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/dask_gateway.tf b/src/_nebari/stages/kubernetes_services/template/dask_gateway.tf index cb35bf60c8..b9b0a9c6c3 100644 --- a/src/_nebari/stages/kubernetes_services/template/dask_gateway.tf +++ b/src/_nebari/stages/kubernetes_services/template/dask_gateway.tf @@ -11,12 +11,6 @@ variable "dask-gateway-profiles" { description = "Dask Gateway profiles to expose to user" } -variable "cloud-provider" { - description = "Name of cloud provider." - type = string -} - - # =================== RESOURCES ===================== module "dask-gateway" { source = "./modules/kubernetes/services/dask-gateway" diff --git a/src/_nebari/stages/kubernetes_services/template/jupyterhub.tf b/src/_nebari/stages/kubernetes_services/template/jupyterhub.tf index 481ebc74cd..4f8bebb9e4 100644 --- a/src/_nebari/stages/kubernetes_services/template/jupyterhub.tf +++ b/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 diff --git a/src/_nebari/stages/kubernetes_services/template/variables.tf b/src/_nebari/stages/kubernetes_services/template/variables.tf index 7a125f1c69..4b78f5994e 100644 --- a/src/_nebari/stages/kubernetes_services/template/variables.tf +++ b/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 +}