2024.1.1 release

.github/workflows/test-provider.yaml

@@ -32,8 +32,13 @@ on:
 
 jobs:
   test-render-providers:
-    # avoid running on PRs coming from a fork
-    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
+    # Prevents the execution of this test under the following conditions:
+    # 1. When the 'NO_PROVIDER_CREDENTIALS' GitHub variable is set, indicating the absence of provider credentials.
+    # 2. For pull requests (PRs) originating from a fork, since GitHub does not provide the fork's credentials to the destination repository.
+    # ref. https://github.com/nebari-dev/nebari/issues/2379
+    if: |
+      vars.NO_PROVIDER_CREDENTIALS == '' &&
+      (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request')
     name: "Test Nebari Provider"
     runs-on: ubuntu-latest
     permissions:

.github/workflows/test_local_integration.yaml

@@ -34,14 +34,19 @@ on:
         required: true
         type: string
 
+# When the cancel-in-progress: true option is specified, any concurrent jobs or workflows using the same
+# concurrency group will cancel both the pending and currently running jobs or workflows. This allows only
+# one job or workflow in the concurrency group to be in progress at a time.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test-local-integration:
     runs-on: "cirun-runner--${{ github.run_id }}"
     defaults:
       run:
         shell: bash -l {0}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
     steps:
       - name: 'Checkout Infrastructure'
         uses: actions/checkout@main

.pre-commit-config.yaml

@@ -51,13 +51,13 @@ repos:
 
   # python
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.3.0
     hooks:
       - id: black
         args: ["--line-length=88", "--exclude=/src/_nebari/template/"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.3.5
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -73,7 +73,7 @@ repos:
 
   # terraform
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.86.0
+    rev: v1.88.4
     hooks:
       - id: terraform_fmt
         args:

RELEASE.md

@@ -9,6 +9,26 @@ This file is copied to nebari-dev/nebari-docs using a GitHub Action. -->
 
 ---
 
+## Release 2024.4.1 - April 20, 2024
+
+### What's Changed
+* update azurerm version by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2370
+* Get JupyterHub `groups` from Keycloak, support `oauthenticator` 16.3+ by @krassowski in https://github.com/nebari-dev/nebari/pull/2361
+* add full names for cloud providers in guided init by @exitflynn in https://github.com/nebari-dev/nebari/pull/2375
+* Add middleware to prefix JupyterHub navbar items with /hub. by @marcelovilla in https://github.com/nebari-dev/nebari/pull/2360
+* CLN: split #1928, refactor render test by @fangchenli in https://github.com/nebari-dev/nebari/pull/2246
+* add trailing slash for jupyterhub proxy paths by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2387
+* remove references to deprecated cdsdashboards by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2390
+* add default node groups to config by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2398
+* Update concurrency settings for Integration tests by @viniciusdc in https://github.com/nebari-dev/nebari/pull/2393
+* Make CI/CD Cloud Provider Test Conditional by @tylergraff in https://github.com/nebari-dev/nebari/pull/2369
+
+### New Contributors
+* @exitflynn made their first contribution in https://github.com/nebari-dev/nebari/pull/2375
+
+**Full Changelog**: https://github.com/nebari-dev/nebari/compare/2024.3.3...2024.4.1
+
+
 ## Release 2024.3.3 - March 27, 2024
 
 ### What's Changed

pyproject.toml

@@ -63,7 +63,7 @@ dependencies = [
     "kubernetes==27.2.0",
     "pluggy==1.3.0",
     "prompt-toolkit==3.0.36",
-    "pydantic==1.10.12",
+    "pydantic==2.4.2",
     "pynacl==1.5.0",
     "python-keycloak>=3.9.0",
     "questionary==2.0.0",

src/_nebari/config.py

@@ -2,27 +2,27 @@
 import pathlib
 import re
 import sys
-import typing
+from typing import Any, Dict, List, Union
 
 import pydantic
 
 from _nebari.utils import yaml
 
 
-def set_nested_attribute(data: typing.Any, attrs: typing.List[str], value: typing.Any):
+def set_nested_attribute(data: Any, attrs: List[str], value: Any):
     """Takes an arbitrary set of attributes and accesses the deep
     nested object config to set value
     """
 
-    def _get_attr(d: typing.Any, attr: str):
+    def _get_attr(d: Any, attr: str):
         if isinstance(d, list) and re.fullmatch(r"\d+", attr):
             return d[int(attr)]
         elif hasattr(d, "__getitem__"):
             return d[attr]
         else:
             return getattr(d, attr)
 
-    def _set_attr(d: typing.Any, attr: str, value: typing.Any):
+    def _set_attr(d: Any, attr: str, value: Any):
         if isinstance(d, list) and re.fullmatch(r"\d+", attr):
             d[int(attr)] = value
         elif hasattr(d, "__getitem__"):
@@ -63,6 +63,15 @@ def set_config_from_environment_variables(
     return config
 
 
+def dump_nested_model(model_dict: Dict[str, Union[pydantic.BaseModel, str]]):
+    result = {}
+    for key, value in model_dict.items():
+        result[key] = (
+            value.model_dump() if isinstance(value, pydantic.BaseModel) else value
+        )
+    return result
+
+
 def read_configuration(
     config_filename: pathlib.Path,
     config_schema: pydantic.BaseModel,
@@ -77,7 +86,8 @@ def read_configuration(
         )
 
     with filename.open() as f:
-        config = config_schema(**yaml.load(f.read()))
+        config_dict = yaml.load(f)
+        config = config_schema(**config_dict)
 
     if read_environment:
         config = set_config_from_environment_variables(config)
@@ -87,14 +97,15 @@ def read_configuration(
 
 def write_configuration(
     config_filename: pathlib.Path,
-    config: typing.Union[pydantic.BaseModel, typing.Dict],
+    config: Union[pydantic.BaseModel, Dict],
     mode: str = "w",
 ):
     """Write the nebari configuration file to disk"""
     with config_filename.open(mode) as f:
         if isinstance(config, pydantic.BaseModel):
-            yaml.dump(config.dict(), f)
+            yaml.dump(config.model_dump(), f)
         else:
+            config = dump_nested_model(config)
             yaml.dump(config, f)
 
 

src/_nebari/constants.py

@@ -1,4 +1,4 @@
-CURRENT_RELEASE = "2024.3.3"
+CURRENT_RELEASE = "2024.4.1"
 
 # NOTE: Terraform cannot be upgraded further due to Hashicorp licensing changes
 # implemented in August 2023.

src/_nebari/initialize.py

@@ -3,6 +3,7 @@
 import re
 import tempfile
 from pathlib import Path
+from typing import Any, Dict
 
 import pydantic
 import requests
@@ -18,6 +19,13 @@
 )
 from _nebari.provider.oauth.auth0 import create_client
 from _nebari.stages.bootstrap import CiEnum
+from _nebari.stages.infrastructure import (
+    DEFAULT_AWS_NODE_GROUPS,
+    DEFAULT_AZURE_NODE_GROUPS,
+    DEFAULT_DO_NODE_GROUPS,
+    DEFAULT_GCP_NODE_GROUPS,
+    node_groups_to_dict,
+)
 from _nebari.stages.kubernetes_ingress import CertificateEnum
 from _nebari.stages.kubernetes_keycloak import AuthenticationEnum
 from _nebari.stages.terraform_state import TerraformStateEnum
@@ -45,7 +53,7 @@ def render_config(
     region: str = None,
     disable_prompt: bool = False,
     ssl_cert_email: str = None,
-):
+) -> Dict[str, Any]:
     config = {
         "provider": cloud_provider,
         "namespace": namespace,
@@ -112,11 +120,12 @@ def render_config(
     if cloud_provider == ProviderEnum.do:
         do_region = region or constants.DO_DEFAULT_REGION
         do_kubernetes_versions = kubernetes_version or get_latest_kubernetes_version(
-            digital_ocean.kubernetes_versions(do_region)
+            digital_ocean.kubernetes_versions()
         )
         config["digital_ocean"] = {
             "kubernetes_version": do_kubernetes_versions,
             "region": do_region,
+            "node_groups": node_groups_to_dict(DEFAULT_DO_NODE_GROUPS),
         }
 
         config["theme"]["jupyterhub"][
@@ -131,6 +140,7 @@ def render_config(
         config["google_cloud_platform"] = {
             "kubernetes_version": gcp_kubernetes_version,
             "region": gcp_region,
+            "node_groups": node_groups_to_dict(DEFAULT_GCP_NODE_GROUPS),
         }
 
         config["theme"]["jupyterhub"][
@@ -152,6 +162,7 @@ def render_config(
             "kubernetes_version": azure_kubernetes_version,
             "region": azure_region,
             "storage_account_postfix": random_secure_string(length=4),
+            "node_groups": node_groups_to_dict(DEFAULT_AZURE_NODE_GROUPS),
         }
 
         config["theme"]["jupyterhub"][
@@ -170,6 +181,7 @@ def render_config(
         config["amazon_web_services"] = {
             "kubernetes_version": aws_kubernetes_version,
             "region": aws_region,
+            "node_groups": node_groups_to_dict(DEFAULT_AWS_NODE_GROUPS),
         }
         config["theme"]["jupyterhub"][
             "hub_subtitle"
@@ -189,7 +201,7 @@ def render_config(
     from nebari.plugins import nebari_plugin_manager
 
     try:
-        config_model = nebari_plugin_manager.config_schema.parse_obj(config)
+        config_model = nebari_plugin_manager.config_schema.model_validate(config)
     except pydantic.ValidationError as e:
         print(str(e))