Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Name change QHub --> Nebari #1508

Merged
merged 41 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
aae3e19
Name change: .github
Oct 25, 2022
41c71f5
Name change: qhub/
Oct 25, 2022
93bb786
Name change: tests/
Oct 25, 2022
6482058
Name change: tests_deployment/
Oct 25, 2022
29cdf3b
Name change: tests_e2e/
Oct 25, 2022
8dc5dec
Name change: /
Oct 25, 2022
ade8ba1
Rename folder
Oct 25, 2022
875c510
Rename releases
Oct 25, 2022
5ab53a7
Remove qhub/
Oct 25, 2022
b9d0165
Run pre-commit
Oct 25, 2022
37faa11
Revert docs links
Oct 25, 2022
75ef358
Fix infracost artifact names
viniciusdc Oct 25, 2022
d082bee
Update upgrade command + test
Oct 25, 2022
68a8ce5
Updates based on review
Oct 25, 2022
97404b7
Update step output format
Oct 25, 2022
cd4988f
Fix: Update step output format
Oct 25, 2022
4db149a
Update nebari/provider/cicd/common.py
iameskild Oct 26, 2022
6e6a64c
Update stage 08 folder names
Oct 26, 2022
b68a4fe
Update nebari/schema.py
iameskild Oct 26, 2022
b596d1b
Update nebari/template/stages/02-infrastructure/azure/variables.tf
iameskild Oct 26, 2022
6424e5d
Update nebari/template/stages/02-infrastructure/do/variables.tf
iameskild Oct 26, 2022
d1f6b1e
Update nebari/template/stages/02-infrastructure/gcp/variables.tf
iameskild Oct 26, 2022
99a5d2d
Update nebari/template/stages/02-infrastructure/gcp/variables.tf
iameskild Oct 26, 2022
08d10cf
Update nebari/template/stages/03-kubernetes-initialize/variables.tf
iameskild Oct 26, 2022
b7995db
Update nebari/template/stages/05-kubernetes-keycloak/variables.tf
iameskild Oct 26, 2022
4b99b94
Update nebari/template/stages/06-kubernetes-keycloak-configuration/va…
iameskild Oct 26, 2022
9bc9f29
Update nebari/template/stages/06-kubernetes-keycloak-configuration/va…
iameskild Oct 26, 2022
6bdf8fc
Update nebari/template/stages/07-kubernetes-services/modules/kubernet…
iameskild Oct 26, 2022
18a283f
Update setup.cfg
iameskild Oct 26, 2022
68d9861
Update scripts/aws-force-destroy.py
iameskild Oct 26, 2022
c7e7ed9
Update setup.cfg
iameskild Oct 26, 2022
481c261
Update setup.cfg
iameskild Oct 26, 2022
70fb898
Update setup.cfg
iameskild Oct 26, 2022
e3f0fd8
Update setup.cfg
iameskild Oct 26, 2022
68decf9
Update nebari/constants.py
iameskild Oct 26, 2022
27ea17d
Update setup.cfg
iameskild Oct 26, 2022
fca0cdf
fix flake8 complaint
Oct 26, 2022
6b42bd4
Update ref to qhub-dask to nebari-dask
Oct 26, 2022
7ec93ff
Update readme
Oct 26, 2022
ce1622e
Merge release/2022.10.1
Oct 26, 2022
ed98941
Change to PYPI_API_TOKEN
Oct 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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
Comment on lines +3 to 11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this @trallard or use the ones from the organization? I think they are globally present in all repos under nebari-dev right?

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -49,20 +49,20 @@ 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)
- Copy release notes from `RELEASE.md`.
- [ ] [Merge automated release PR for `qhub` on Conda-Forge.](https://github.com/conda-forge/qhub-feedstock)
- [ ] [Merge automated release PR for `nebari` on Conda-Forge.](https://github.com/conda-forge/nebari-feedstock)
50 changes: 29 additions & 21 deletions .github/workflows/infracost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -16,7 +16,7 @@ env:

jobs:
infracost:
name: Run Infracost on QHub Infrastructure
name: Run Infracost on Nebari Infrastructure
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/kubernetes_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"
push:
Expand All @@ -21,7 +21,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"

Expand All @@ -33,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}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdown.links.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:

- name: Create tag
run: |
echo "QHUB_TAG=$(git describe --tags)" >> $GITHUB_ENV
echo ${{ env.QHUB_TAG }}
echo "NEBARI_TAG=$(git describe --tags)" >> $GITHUB_ENV
echo ${{ env.NEBARI_TAG }}

- name: Build source and binary
run: python -m build --sdist --wheel .
Expand All @@ -43,10 +43,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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"
push:
Expand All @@ -21,7 +21,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"
push:
Expand All @@ -21,7 +21,7 @@ on:
- "tests_deployment/**"
- "tests_e2e/**"
- "scripts/**"
- "qhub/**"
- "nebari/**"
- "setup.cfg"
- "pyproject.yoml"

Expand All @@ -42,22 +42,22 @@ 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"
black nebari --diff --exclude "nebari/_version.py"
black --check nebari --exclude "nebari/_version.py"
- name: Flake8 Formatting
run: |
flake8 --version
flake8
- name: Test QHub
- name: Test Nebari
run: |
pytest --version
pytest --ignore=tests_deployment
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_build

# setuptools scm
qhub/_version.py
nebari/_version.py

# ignore terraform state
.terraform
Expand Down Expand Up @@ -40,7 +40,7 @@ data*
# modules - removed this because .terraform folder is in .gitignore of deployments,
# this should cover imported modules while not gitignoring our new direct 'modules' folder.

# ignore qhub files
qhub-config.yaml
# ignore nebari files
nebari-config.yaml

.vscode/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: check-json
- id: check-yaml
# jinja2 templates for helm charts
exclude: 'qhub/template/stages/07-kubernetes-services/modules/kubernetes/services/(clearml/chart/templates/.*|prefect/chart/templates/.*)'
exclude: 'nebari/template/stages/07-kubernetes-services/modules/kubernetes/services/(clearml/chart/templates/.*|prefect/chart/templates/.*)'
args: [--allow-multiple-documents]

- repo: https://github.com/codespell-project/codespell
Expand Down
Loading