Fix integration tests, helm-validate script (#2102)

Co-authored-by: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>

.github/ISSUE_TEMPLATE/release-checklist.md

@@ -39,6 +39,8 @@ Release captain responsible - <@gh_username>
   - [Do we need to update the `dask` versions in the `nebari-dask`?](https://github.com/conda-forge/nebari-dask-feedstock/blob/main/recipe/meta.yaml#L13-L16)
   - Will there be an accompanying blog post?
 - [ ] Prepare for the release.
+  - [ ] Update the [`nebari upgrade`](https://github.com/nebari-dev/nebari/blob/develop/src/_nebari/upgrade.py) for this release
+    - [ ] Add upgrade messaging including deprecation warnings, version specific warnings and so on.
   - [ ] Announce build freeze.
   - [ ] Release Candidate (RC) cycle.
     - Is this a hotfix?

.github/workflows/test_helm_charts.yaml

@@ -7,9 +7,14 @@ on:
   schedule:
     # Run every Monday at 13:00 UTC
     - cron: "0 13 * * 1"
+  pull_request:
+    paths:
+      - ".github/workflows/test_helm_charts.yaml"
+      - "scripts/helm-validate.py"
   push:
     paths:
       - ".github/workflows/test_helm_charts.yaml"
+      - "scripts/helm-validate.py"
   workflow_dispatch:
 
 jobs:

README.md

@@ -14,7 +14,7 @@
 | :---------- | :-----|
 |   Project   | [![License](https://img.shields.io/badge/License-BSD%203--Clause-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Nebari documentation](https://img.shields.io/badge/%F0%9F%93%96%20Read-the%20docs-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://www.nebari.dev/docs/welcome) [![PyPI](https://img.shields.io/pypi/v/nebari)](https://badge.fury.io/py/nebari) [![conda version](https://img.shields.io/conda/vn/conda-forge/nebari)]((https://anaconda.org/conda-forge/nebari))  |
 |  Community  | [![GH discussions](https://img.shields.io/badge/%F0%9F%92%AC%20-Participate%20in%20discussions-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://github.com/nebari-dev/nebari/discussions) [![Open an issue](https://img.shields.io/badge/%F0%9F%93%9D%20Open-an%20issue-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://github.com/nebari-dev/nebari/issues/new/choose) [![Community guidelines](https://img.shields.io/badge/🤝%20Community-guidelines-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://www.nebari.dev/docs/community/) |
-|     CI      | [![Kubernetes Tests](https://github.com/nebari-dev/nebari/actions/workflows/kubernetes_test.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/kubernetes_test.yaml) [![Tests](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml) [![Test Nebari Provider](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml) |
+|     CI      | [![Kubernetes Tests](https://github.com/nebari-dev/nebari/actions/workflows/test_local_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/kubernetes_test.yaml) [![Tests](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml) [![Test Nebari Provider](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml) |
 
 ## Table of contents
 

pyproject.toml

@@ -79,22 +79,24 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "black==22.3.0",
-    "mypy==1.6.1",
+    "coverage[toml]",
     "dask-gateway",
     "diagrams",
-    "python-dotenv",
     "escapism",
     "importlib-metadata<5.0",
     "jhub-client",
+    "jinja2",
+    "mypy==1.6.1",
     "paramiko",
     "pre-commit",
-    "pytest",
-    "pytest-timeout",
-    "pytest-playwright",
     "pytest-cov",
-    "coverage[toml]",
-    "jinja2",
+    "pytest-playwright",
+    "pytest-timeout",
+    "pytest",
+    "python-dotenv",
+    "python-hcl2",
     "setuptools==63.4.3",
+    "tqdm",
 ]
 docs = [
     "sphinx",

scripts/helm-validate.py

@@ -214,7 +214,7 @@ def add_workflow_job_summary(chart_index: dict):
 
 if __name__ == "__main__":
     # charts = generate_index_of_helm_charts()
-    STAGES_DIR = "nebari/template/stages"
+    STAGES_DIR = "src/_nebari/stages"
     SKIP_CHARTS = ["helm-extensions"]
 
     charts = HelmChartIndexer(

src/_nebari/initialize.py

@@ -47,7 +47,7 @@ def render_config(
     ssl_cert_email: str = None,
 ):
     config = {
-        "provider": cloud_provider.value,
+        "provider": cloud_provider,
         "namespace": namespace,
         "nebari_version": __version__,
     }