Release/2022.10.1 (#1527)

* Switch to CalVer (#1501) * Run CI on branchs release/** * Update pyproject.toml to use calver * Update on branch * Update theme welcome messages to use Nebari (#1503) * update welcome messge * remove qhub specifics from theme * Name change QHub --> Nebari (#1508) * Name change: .github * Name change: qhub/ * Name change: tests/ * Name change: tests_deployment/ * Name change: tests_e2e/ * Name change: / * Rename folder * Rename releases * Remove qhub/ * Run pre-commit * Revert docs links * Fix infracost artifact names * Update upgrade command + test * Updates based on review * Update step output format * Fix: Update step output format * Update nebari/provider/cicd/common.py Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update stage 08 folder names * Update nebari/schema.py Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/02-infrastructure/azure/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/02-infrastructure/do/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/02-infrastructure/gcp/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/02-infrastructure/gcp/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/03-kubernetes-initialize/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/05-kubernetes-keycloak/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/06-kubernetes-keycloak-configuration/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/06-kubernetes-keycloak-configuration/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/template/stages/07-kubernetes-services/modules/kubernetes/forwardauth/variables.tf Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update scripts/aws-force-destroy.py Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * Update nebari/constants.py Co-authored-by: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com> * Update setup.cfg Co-authored-by: Tania Allard <taniar.allard@gmail.com> * fix flake8 complaint * Update ref to qhub-dask to nebari-dask * Update readme * Change to PYPI_API_TOKEN Co-authored-by: viniciusdc <vinivdc2009@hotmail.com> Co-authored-by: Tania Allard <taniar.allard@gmail.com> Co-authored-by: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com> * qhub/initialize: lazy load attributes that require remote information (#1509) * qhub/initialize: lazy load attributes that require remote information * Fix broken configuration * fix renaming * fix header text * Update nebari/initialize.py * Update nebari/initialize.py * Blackify Co-authored-by: Amit Kumar <dtu.amit@gmail.com> Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com> * Update README logo (#1514) * Add fix, enhancements and pytests for CLI (#1498) * Add fix, enhancements and pytests for CLI * No zero-padded month for CalVer release branches * Update cli test * Simplify test.yaml * Remove old CLI + cleanup (#1519) * Remove old cli * Update theme * Remove shim * display_version: True * Update `skip_remote_state_provision` default value (#1521) * Add release notes for 2022.10.1 (#1523) * Add release notes for 2022.10.1 * Wording * Update README.md with new docs links * Update README.md with new docs links Co-authored-by: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com> * Remove leading `v` for release action (#1526) * Remove leading v for release tags * Add note to release checklist * Merge release branch into main Co-authored-by: Pavithra Eswaramoorthy <pavithraes@outlook.com> Co-authored-by: viniciusdc <vinivdc2009@hotmail.com> Co-authored-by: Tania Allard <taniar.allard@gmail.com> Co-authored-by: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com> Co-authored-by: Filipe Laíns <filipe.lains@gmail.com> Co-authored-by: Amit Kumar <dtu.amit@gmail.com> Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com>
nebari-dev · Nov 2, 2022 · 788aae8 · 788aae8
1 parent f35de27
commit 788aae8
Show file tree

Hide file tree

Showing 377 changed files with 1,242 additions and 1,623 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,13 +7,13 @@ body:
   - type: markdown
     attributes:
       value: |
-        Hi! Thanks for using QHub and taking some time to contribute to this project.
+        Hi! Thanks for using Nebari and taking some time to contribute to this project.
 
         Please answer the following sections to help us troubleshoot the problem.
 
   - type: input
     attributes:
-      label: OS system and architecture in which you are running QHub
+      label: OS system and architecture in which you are running Nebari
     validations:
       required: true
 
@@ -68,7 +68,7 @@ body:
         Describe your environment:
         - Conda version (use `conda --version`)
         - Kubernetes version (use `kubectl version`)
-        - QHub version
+        - Nebari version
     validations:
       required: false
 
@@ -89,7 +89,7 @@ body:
   - type: dropdown
     attributes:
       label: Integrations
-      description: Is this issue related to onay of the QHub integrations?
+      description: Is this issue related to onay of the Nebari integrations?
       multiple: true
       options:
         - "Prefect"

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: QHub Documentation 📖
-    url: https://docs.qhub.dev/en/stable/
-    about: Read QHub docs and development guide.
+  - name: Nebari Documentation 📖
+    url: https://docs.nebari.dev/en/stable/
+    about: Read Nebari docs and development guide.
   - name: GitHub discussions 💬
-    url: https://github.com/Quansight/qhub/discussions
+    url: https://github.com/Quansight/nebari/discussions
     about: Keep up to date with the community discussions
   - name: "(maintainers only) Blank issue"
-    url: https://github.com/Quansight/qhub/issues/new
+    url: https://github.com/Quansight/nebari/issues/new
     about: For maintainers only - should be used sparingly
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
@@ -12,4 +12,4 @@ labels: ["type: documentation"]
 Don't be shy, we will love to hear from you! 👂
 **
 
-Have a question instead? Head over to our [Discussion Q&A](https://github.com/Quansight/qhub/discussions/categories/q-a) page and tell us what is bothering you.
+Have a question instead? Head over to our [Discussion Q&A](https://github.com/Quansight/nebari/discussions/categories/q-a) page and tell us what is bothering you.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Hi! Thanks for using QHub and taking some time to contribute to this project.
+        Hi! Thanks for using Nebari and taking some time to contribute to this project.
 
   - type: textarea
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md
@@ -26,7 +26,7 @@ Release captain responsible - <@gh_username>
 
 ## Looking forward - planning
 
-- [ ] [Create milestone for next release](https://github.com/Quansight/qhub/milestones) (if it doesn't already exist) and link it back here.
+- [ ] [Create milestone for next release](https://github.com/nebari-dev/nebari/milestones) (if it doesn't already exist) and link it back here.
 - [ ] Triage `bugs` to determine what be should included in the release and add it to the milestone.
 - [ ] What new features, if any, will be included in the release and add it to the milestone.
   - This will be, in large part, determined by the roadmap.
@@ -40,7 +40,7 @@ Release captain responsible - <@gh_username>
   - Has documentation been updated appropriately?
   - Are there any breaking changes that should be highlighted?
   - Are there any upstream releases we are waiting on?
-  - [Do we need to update the `dask` versions in the `qhub-dask`?](https://github.com/conda-forge/qhub-dask-feedstock/blob/main/recipe/meta.yaml#L13-L16)
+  - [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.
   - [ ] Announce build freeze.
@@ -49,20 +49,22 @@ Release captain responsible - <@gh_username>
       - [ ] Create a new branch off of the last version tag.
         - Use this branch to cut the pre-release and the "official" release.
       - [ ] `git cherry-pick` the commits that should be included.
-    - [ ] Perform end-to-end testing. [Use the Testing Checklist template.](https://github.com/Quansight/qhub/issues/new?assignees=&labels=type%3A+release+%F0%9F%8F%B7&template=testing-checklist.md&title=Testing+checklist+for+<version>)
+    - [ ] Perform end-to-end testing. [Use the Testing Checklist template.](https://github.com/nebari-dev/nebari/issues/new?assignees=&labels=type%3A+release+%F0%9F%8F%B7&template=testing-checklist.md&title=Testing+checklist+for+<version>)
       - For minor releases, relying on the end-to-end integration tests might suffice.
-    - [ ] [Cut RC via GHA release workflow (w/ "This is a pre-release" checked).](https://github.com/Quansight/qhub/releases/new)
+    - [ ] [Cut RC via GHA release workflow (w/ "This is a pre-release" checked).](https://github.com/nebari-dev/nebari/releases/new)
     - [ ] End-user validation.
       - If possible, pull in volunteers to help test.
       - (Repeat steps if necessary)
-  - [ ] [Update `RELEASE.md` notes.](https://github.com/Quansight/qhub/blob/main/RELEASE.md)
+  - [ ] [Update `RELEASE.md` notes.](https://github.com/nebari-dev/nebari/blob/main/RELEASE.md)
 
 
 ## Cut the official release
 
 *These steps must be actioned in the order they appear in this checklist.*
 - [ ] [Tag, build and push docker images](https://github.com/nebari-dev/nebari-docker-images/releases/new)
-- [ ] [Update and cut release for `qhub-dask` meta package on Conda-Forge.](https://github.com/conda-forge/qhub-dask-feedstock)
-- [ ] [Cut PyPI release via GHA release workflow.](https://github.com/Quansight/qhub/releases/new)
+- [ ] [Update and cut release for `nebari-dask` meta package on Conda-Forge.](https://github.com/conda-forge/nebari-dask-feedstock)
+- [ ] [Cut PyPI release via GHA release workflow.](https://github.com/nebari-dev/nebari/releases/new)
+  - Avoid appending `v` to tag.
     - Copy release notes from `RELEASE.md`.
-- [ ] [Merge automated release PR for `qhub` on Conda-Forge.](https://github.com/conda-forge/qhub-feedstock)
+- [ ] Merge release branch into `main`
+- [ ] [Merge automated release PR for `nebari` on Conda-Forge.](https://github.com/conda-forge/nebari-feedstock)
diff --git a/.github/workflows/infracost.yml b/.github/workflows/infracost.yml
@@ -3,7 +3,7 @@ name: Infracost CI
 on:
   pull_request:
     paths:
-      - 'qhub/template/stages/02-infrastructure'
+      - 'nebari/template/stages/02-infrastructure'
       - '.github/workflows/infracost.yml'
 
 env:
@@ -16,7 +16,7 @@ env:
 
 jobs:
   infracost:
-    name: Run Infracost on QHub Infrastructure
+    name: Run Infracost on Nebari Infrastructure
     runs-on: ubuntu-latest
 
     strategy:
@@ -45,12 +45,12 @@ jobs:
         with:
           filters: |
             aws:
-              - 'qhub/template/stages/02-infrastructure/aws/**'
-              - 'qhub/template/stages/01-terraform-state/aws/**'
+              - 'nebari/template/stages/02-infrastructure/aws/**'
+              - 'nebari/template/stages/01-terraform-state/aws/**'
             gcp:
-              - 'qhub/template/stages/02-infrastructure/gcp/**'
+              - 'nebari/template/stages/02-infrastructure/gcp/**'
             azure:
-              - 'qhub/template/stages/02-infrastructure/azure/**'
+              - 'nebari/template/stages/02-infrastructure/azure/**'
 
       # Setup Google Cloud SDK
       - name: Set up Cloud SDK
@@ -72,19 +72,19 @@ jobs:
         with:
           python-version: 3.8
 
-      # Install QHub
-      - name: Install QHub
+      # Install Nebari
+      - name: Install Nebari
         if: steps.changes.outputs.${{ matrix.provider }} == 'true'
         run: |
           pip install .[dev]
 
-      # Initialize QHub and render the infrastructure
-      - name: QHub initialize and render
+      # Initialize Nebari and render the infrastructure
+      - name: Nebari initialize and render
         run: |
           mkdir data && cd data
-          qhub init "${{ matrix.provider }}" --project "TestProvider" --terraform-state=remote --domain "${{ matrix.provider }}.qhub.dev" --auth-provider github --disable-prompt
-          cat qhub-config.yaml
-          qhub render -c qhub-config.yaml
+          nebari init "${{ matrix.provider }}" --project "TestProvider" --terraform-state=remote --domain "${{ matrix.provider }}.nebari.dev" --auth-provider github --disable-prompt
+          cat nebari-config.yaml
+          nebari render -c nebari-config.yaml
 
       # Run Infracost on the base branch to generate the baseline cost
       - name: Generate Infracost cost estimate baseline
@@ -98,19 +98,19 @@ jobs:
       - name: Checkout PR branch
         uses: actions/checkout@v3
 
-      # Install QHub
-      - name: Install QHub
+      # Install Nebari
+      - name: Install Nebari
         if: steps.changes.outputs.${{ matrix.provider }} == 'true'
         run: |
           pip install .[dev]
 
-      # Initialize QHub and render the infrastructure
-      - name: QHub initialize and render
+      # Initialize Nebari and render the infrastructure
+      - name: Nebari initialize and render
         run: |
           mkdir data && cd data
-          qhub init "${{ matrix.provider }}" --project "TestProvider" --terraform-state=remote --domain "${{ matrix.provider }}.qhub.dev" --auth-provider github --disable-prompt
-          cat qhub-config.yaml
-          qhub render -c qhub-config.yaml
+          nebari init "${{ matrix.provider }}" --project "TestProvider" --terraform-state=remote --domain "${{ matrix.provider }}.nebari.dev" --auth-provider github --disable-prompt
+          cat nebari-config.yaml
+          nebari render -c nebari-config.yaml
 
       # Generate Infracost diff cost estimate only if the file has been changed
       - name: Generate Infracost diff
@@ -140,11 +140,19 @@ jobs:
             echo "No changes detected in infrastructure"
           fi
 
+      # parse pull_request.base.ref before generating artifacts
+      - name: Parse artifact name
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+        id: parse
+        run: |
+          echo "artifact_name_base=$(echo $BASE_REF | sed 's/\//-/g')" >> $GITHUB_OUTPUT
+
       # Save artifacts to the PR
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: infracost-data-${{ matrix.provider }}-${{ github.event.pull_request.base.ref }}
+          name: infracost-data-${{ matrix.provider }}-${{ steps.parse.outputs.artifact_name_base }}
           path: |
             /tmp/infracost.json
             /tmp/infracost-base.json
diff --git a/.github/workflows/kubernetes_test.yaml b/.github/workflows/kubernetes_test.yaml
@@ -8,19 +8,20 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
   push:
     branches:
       - main
+      - release/\d{4}.\d{1,2}.\d{1,2}
     paths:
       - ".github/workflows/kubernetes_test.yaml"
       - "tests/**"
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
 
@@ -32,9 +33,9 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-      - name: "Set QHUB_IMAGE_TAG=main"
+      - name: "Set NEBARI_IMAGE_TAG=main"
         run: |
-          echo "QHUB_IMAGE_TAG=main" >> "$GITHUB_ENV"
+          echo "NEBARI_IMAGE_TAG=main" >> "$GITHUB_ENV"
           echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"
           echo "GITHUB_HEAD_REF: ${GITHUB_HEAD_REF}"
           echo "GITHUB_REF: ${GITHUB_REF}"

diff --git a/.github/workflows/markdown.links.config.json b/.github/workflows/markdown.links.config.json
@@ -10,13 +10,13 @@
         "pattern": "linuxize.com"
     },
     {
-        "pattern": "github-actions.qhub.dev"
+        "pattern": "github-actions.nebari.dev"
     },
     {
         "pattern": "127.0.0.1:8000"
     },
     {
-        "pattern": "myqhubsite.com"
+        "pattern": "mynebarisite.com"
     },
     {
         "pattern": "https://cloud.google.com"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,9 +24,10 @@ jobs:
           fetch-depth: 0
 
       - name: Create tag
+        # if present, remove leading `v`
         run: |
-          echo "QHUB_TAG=$(git describe --tags)" >> $GITHUB_ENV
-          echo ${{ env.QHUB_TAG }}
+          echo "NEBARI_TAG=$(git describe --tags | sed 's/^v//')" >> $GITHUB_ENV
+          echo ${{ env.NEBARI_TAG }}
 
       - name: Build source and binary
         run: python -m build --sdist --wheel .
@@ -43,10 +44,10 @@ jobs:
             pip install \
             --index-url https://test.pypi.org/simple/ \
             --extra-index-url https://pypi.org/simple \
-            qhub==${{ env.QHUB_TAG }}
+            nebari==${{ env.NEBARI_TAG }}
 
   release-pypi:
-    name: Publish QHub on PyPi
+    name: Publish Nebari on PyPi
     runs-on: ubuntu-latest
     needs: test-pypi
 
@@ -70,5 +71,4 @@ jobs:
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: ${{ secrets.PYPI_USERNAME }}
-          password: ${{ secrets.pypi_password }}
+          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/run-pre-commit.yaml b/.github/workflows/run-pre-commit.yaml
@@ -2,7 +2,9 @@ name: Run pre-commit
 
 on:
   push:
-    branches: [ main ]
+    branches:
+    - main
+    - release/\d{4}.\d{1,2}.\d{1,2}
   pull_request:
 
 jobs:

diff --git a/.github/workflows/test-provider.yaml b/.github/workflows/test-provider.yaml
@@ -8,19 +8,20 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
   push:
     branches:
       - main
+      - release/\d{4}.\d{1,2}.\d{1,2}
     paths:
       - ".github/workflows/test-provider.yaml"
       - "tests/**"
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,25 +8,26 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
   push:
     branches:
       - main
+      - release/\d{4}.\d{1,2}.\d{1,2}
     paths:
       - ".github/workflows/test.yaml"
       - "tests/**"
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "qhub/**"
+      - "nebari/**"
       - "setup.cfg"
       - "pyproject.yoml"
 
 jobs:
   test-general:
-    name: 'Test Package'
+    name: 'Pytest'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -41,22 +42,13 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install QHub
+      - name: Install Nebari
         run: |
           pip install .[dev]
-      - name: Black Formatting
-        run: |
-          black --version
-          black qhub --diff --exclude "qhub/_version.py"
-          black --check qhub --exclude "qhub/_version.py"
-      - name: Flake8 Formatting
-        run: |
-          flake8 --version
-          flake8
-      - name: Test QHub
+      - name: Test Nebari
         run: |
           pytest --version
           pytest --ignore=tests_deployment