Merge branch 'release/2022.11.1' into cirun-unique-runners

nebari/cli/init.py

@@ -37,8 +37,8 @@
 CREATE_GITHUB_OAUTH_CREDS = "https://docs.github.com/en/developers/apps/building-oauth-apps/creating-an-oauth-app"
 
 # links to Nebari docs
-DOCS_HOME = "https://nebari.dev"
-CHOOSE_CLOUD_PROVIDER = "https://nebari.dev/getting-started/deploy"
+DOCS_HOME = "https://nebari.dev/docs/"
+CHOOSE_CLOUD_PROVIDER = "https://nebari.dev/docs/get-started/deploy"
 
 
 def enum_to_list(enum_cls):
@@ -159,6 +159,8 @@ def check_cloud_provider_creds(ctx: typer.Context, cloud_provider: str):
             "Paste your SPACES_SECRET_ACCESS_KEY",
             hide_input=True,
         )
+        os.environ["AWS_ACCESS_KEY_ID"] = os.getenv("SPACES_ACCESS_KEY_ID")
+        os.environ["AWS_SECRET_ACCESS_KEY"] = os.getenv("AWS_SECRET_ACCESS_KEY")
 
     # AZURE
     elif cloud_provider == ProviderEnum.azure.value.lower() and (
@@ -542,7 +544,7 @@ def if_used(key, model=inputs, ignore_list=["cloud_provider"]):
                 "You can now deploy your Nebari instance with:\n\n"
                 "\t[green]nebari deploy -c nebari-config.yaml[/green]\n\n"
                 "For more information, run [green]nebari deploy --help[/green] or check out the documentation: "
-                "[green]https://www.nebari.dev/how-tos/[/green]"
+                "[green]https://www.nebari.dev/docs/how-tos/[/green]"
             )
         )
 

nebari/cli/main.py

@@ -189,7 +189,7 @@ def validate(
         help="nebari configuration yaml file path, please pass in as -c/--config flag",
     ),
     enable_commenting: bool = typer.Option(
-        False, "--enable_commenting", help="Toggle PR commenting on GitHub Actions"
+        False, "--enable-commenting", help="Toggle PR commenting on GitHub Actions"
     ),
 ):
     """

nebari/render.py

@@ -1,11 +1,13 @@
 import functools
 import hashlib
+import json
 import os
 import pathlib
 import shutil
 import sys
 from typing import Dict, List
 
+import yaml
 from rich import print
 from rich.table import Table
 from ruamel.yaml import YAML
@@ -162,16 +164,16 @@ def render_contents(config: Dict):
 
     if config.get("ci_cd"):
         for fn, workflow in gen_cicd(config).items():
-            contents.update(
-                {
-                    fn: workflow.json(
-                        indent=2,
-                        by_alias=True,
-                        exclude_unset=True,
-                        exclude_defaults=True,
-                    )
-                }
+            workflow_json = workflow.json(
+                indent=2,
+                by_alias=True,
+                exclude_unset=True,
+                exclude_defaults=True,
             )
+            workflow_yaml = yaml.dump(
+                json.loads(workflow_json), sort_keys=False, indent=2
+            )
+            contents.update({fn: workflow_yaml})
 
     contents.update(gen_gitignore(config))
 

nebari/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/files/examples/dashboard_panel.ipynb

@@ -19,7 +19,7 @@
    "outputs": [],
    "source": [
     "content = panel.pane.Markdown('''\n",
-    "# Hello QHub\n",
+    "# Hello Nebari\n",
     "\n",
     "This is some markdown content\n",
     "''')\n",

nebari/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/files/examples/dask-gateway.ipynb

@@ -32,7 +32,7 @@
    "source": [
     "## List active cluster\n",
     "\n",
-    "QHub has a rich authorization model so it is possible that your given user does not have access. Consult your administrator if you need access."
+    "Nebari has a rich authorization model so it is possible that your given user does not have access. Consult your administrator if you need access."
    ]
   },
   {

nebari/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/files/examples/kbatch_nb.ipynb

@@ -9,7 +9,7 @@
    "source": [
     "# Canonical Tests\n",
     "\n",
-    "The goal of the work we performed on behalf of OGC/USGS was to enable users on QHub (and perhaps plain JupyterHub) to:\n",
+    "The goal of the work we performed on behalf of OGC/USGS was to enable users on Nebari (and perhaps plain JupyterHub) to:\n",
     "- [ ] run long-running notebooks or scripts\n",
     "- [ ] run notebooks and scripts as cronjobs\n",
     "\n",
@@ -27,11 +27,11 @@
     "The first two features outline above will be handled by [`kbatch`](https://github.com/kbatch-dev/kbatch). `kbatch` consists of two major components, the frontend `kbatch` and backend `kbatch-proxy`. The user submits job requests to `kbatch-proxy` and `kbatch-proxy` submits those job requests to the Kubernetes API. \n",
     "\n",
     "> NOTE:\n",
-    "> At the present, no additional features have been added to `kbatch`, we have simply integrated `kbatch-proxy` into QHub. A feature enhancement PR will need to be opened on the `kbatch` repo in order to enable cronjobs.\n",
+    "> At the present, no additional features have been added to `kbatch`, we have simply integrated `kbatch-proxy` into Nebari. A feature enhancement PR will need to be opened on the `kbatch` repo in order to enable cronjobs.\n",
     "\n",
     "### Setup\n",
     "\n",
-    "In order to use `kbatch` in it's current form, some basic setup is required of the user. Going forward, we will assume that `kbatch-proxy` has been correctly integrated into QHub.\n",
+    "In order to use `kbatch` in it's current form, some basic setup is required of the user. Going forward, we will assume that `kbatch-proxy` has been correctly integrated into Nebari.\n",
     "\n",
     "1. Create or modify a conda environment by adding `kbatch`. And activate this conda environment.\n",
     "\n",