Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/_nebari/stages/kubernetes_services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ def to_yaml(cls, representer, node):
return representer.represent_str(node.value)


@schema.yaml_object(schema.yaml)
class HomeStorageEnum(str, enum.Enum):
shared = "shared" # Current behavior (NFS with subPath)
per_user = "per_user" # New: dynamic PVC per user

@classmethod
def to_yaml(cls, representer, node):
return representer.represent_str(node.value)


class DefaultImages(schema.Base):
jupyterhub: str = f"quay.io/nebari/nebari-jupyterhub:{set_docker_image_tag()}"
jupyterlab: str = f"quay.io/nebari/nebari-jupyterlab:{set_docker_image_tag()}"
Expand All @@ -73,6 +83,18 @@ class Storage(schema.Base):
)
conda_store: str = "200Gi"
shared_filesystem: str = "200Gi"
home_storage: HomeStorageEnum = Field(
default=HomeStorageEnum.per_user,
description="Storage mode for user home directories: 'per_user' for individual PVCs, 'shared' for NFS with subPath",
)
home_storage_size: str = Field(
default="10Gi",
description="Size of per-user home directory PVC (only applies when home_storage='per_user')",
)
home_storage_class: Optional[str] = Field(
default=None,
description="Storage class for per-user home PVCs (null uses cluster default)",
)


class JupyterHubTheme(schema.Base):
Expand Down Expand Up @@ -561,6 +583,9 @@ class JupyterhubInputVars(schema.Base):
cloud_provider: str = Field(alias="cloud-provider")
jupyterlab_preferred_dir: Optional[str] = Field(alias="jupyterlab-preferred-dir")
shared_fs_type: SharedFsEnum
home_storage_mode: str = Field(alias="home-storage-mode")
home_storage_size: str = Field(alias="home-storage-size")
home_storage_class: Optional[str] = Field(alias="home-storage-class", default=None)
user_taint_tolerations: Optional[List[Toleration]] = Field(
alias="node-taint-tolerations"
)
Expand Down Expand Up @@ -764,6 +789,9 @@ def _node_taint_tolerations(node_group_name: str) -> List[Toleration]:
if self.config.storage.type == SharedFsEnum.efs
else self.config.storage.type
),
home_storage_mode=self.config.storage.home_storage.value,
home_storage_size=self.config.storage.home_storage_size,
home_storage_class=self.config.storage.home_storage_class,
)

dask_gateway_vars = DaskGatewayInputVars(
Expand Down
22 changes: 22 additions & 0 deletions src/_nebari/stages/kubernetes_services/template/jupyterhub.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,24 @@ variable "shared_fs_type" {

}

variable "home-storage-mode" {
description = "Storage mode for user home directories: 'shared' or 'per_user'"
type = string
default = "per_user"
}

variable "home-storage-size" {
description = "Size of per-user home directory PVC"
type = string
default = "10Gi"
}

variable "home-storage-class" {
description = "Storage class for per-user home directories (null = cluster default)"
type = string
default = null
}

locals {
jupyterhub-fs = var.shared_fs_type
jupyterhub-pvc-name = "jupyterhub-${var.environment}-share"
Expand Down Expand Up @@ -181,6 +199,10 @@ module "jupyterhub" {

shared-pvc = local.jupyterhub-pvc

home-storage-mode = var.home-storage-mode
home-storage-size = var.home-storage-size
home-storage-class = var.home-storage-class

conda-store-pvc = module.kubernetes-conda-store-server.pvc.name
conda-store-mount = "/home/conda"
conda-store-environments = var.conda-store-environments
Expand Down
Loading
Loading