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.

Sign up for GitHub

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

Jump to bottom

Ensure main is accurately tracking release changes #1949

Merged
merged 129 commits into from
Sep 6, 2023
Merged

Ensure main is accurately tracking release changes #1949

merged 129 commits into from
Sep 6, 2023

Conversation

iameskild
Copy link
Member

@iameskild iameskild commented Aug 28, 2023 •
edited
Loading

Reference Issues or PRs

Closes #1912
Closes #1885
Closes #1863

What does this implement/fix?

Put a x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds a feature)
  • Breaking change (fix or feature that would cause existing features not to work as expected)
  • Documentation Update
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Build related changes
  • Other (please describe): Repo clean up

Testing

  • Did you test the pull request locally?
  • Did you add new tests?

Any other comments?

iameskild and others added 30 commits November 21, 2022 15:03
@iameskild
Small CLI fixes (#1529)
13ad453 
* _ --> -

* Fix CLI issues
@aktech @pavithraes @nebari-sensei
Render github actions configurations as yaml (#1528)
9520129 
Co-authored-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>
Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com>
@pavithraes @nebari-sensei @iameskild
Update "QHub" to "Nebari" in example notebooks (#1556)
81207dd 
Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com>
Co-authored-by: eskild <42120229+iameskild@users.noreply.github.com>
@pavithraes @nebari-sensei @iameskild
Update links to Nebari docs in guided init (#1557)
d1d97c7 
Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com>
Co-authored-by: eskild <42120229+iameskild@users.noreply.github.com>
@aktech
CI: Spinup unique cirun runners for each job (#1563)
bd777e6
@limacarvalho
Issue-1417: Improve Dask workers placement on AWS | fixing a minor ty…
1f079a4 
…po (#1487)

Co-authored-by: iameskild <eskild@doublee.io>
@iameskild
Update setup-node version (#1570)
9440ce9
@aktech
Facilitate CI run for contributor PR (#1568)
eb6d01b
@pavithraes @nebari-sensei
Action to sync release notes with nebari-docs (#1554)
d785432 
Co-authored-by: Nebari-sensei <116370392+nebari-sensei@users.noreply.github.com>
Fix merge conflicts
9ba35e1
@iameskild
Restore how the dask worker node group is selected by default (#1577)
5ff666c
@aktech
Fix skip check for workflows (#1578)
0ffe71c
@trallard
📝 Update readme (#1579)
c702b75
@trallard
MAINT - Miscellaneous maintenance tasks (#1580)
4187f03
@iameskild
Wait for Test PyPI to upload test release (#1583)
2d26409
@iameskild
Add release notes for 2022.11.1 (#1584)
784ab81
Merge branch 'release/2022.11.1' into develop
49bca71
@alimanfoo @iameskild
Make conda-store file system read-only by default (#1595)
4607d1c 
Co-authored-by: eskild <42120229+iameskild@users.noreply.github.com>
@trallard
ENH - Switch to ruff and pre-commit.ci (#1602)
0010968
@iameskild @trallard
Migrate to hatch (#1545)
8ab02d2 
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
@iameskild
Add check_repository_cred function to CLI (#1605)
cae947e
@costrouc
Adding jupyterlab-conda-store extension support to Nebari (#1564)
9dbe480
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#1613)
05bd2e3 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@iameskild
Ensure Argo-Workflow controller containerRuntimeExecutor is set to em…
4bb3dcd 
…issary (#1614)
@iameskild
Pass secret_name to TF scripts when certificate type = exisiting (#…
e4401b2 
…1621)

Co-authored-by: iameskild <eskild@doublee.io>
@iameskild
Pin Nebari dependencies, set k8s version for GKE (#1624)
556ff9a 
Co-authored-by: iameskild <eskild@doublee.io>
@iameskild
Create aws-force-destroy bash script (#1611)
fe3fdf7 
Co-authored-by: iameskild <eskild@doublee.io>
@iameskild
Add option for AWS node-groups to run in a single subnet/AZ (#1428)
b2446ec 
Co-authored-by: iameskild <eskild@doublee.io>
@iameskild @costrouc
Add export-users to keycloak CLI command, add dev CLI command (#1610)
6037799 
Co-authored-by: iameskild <eskild.eriksen122@gmail.com>
Co-authored-by: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
@iameskild
Unpin packages in default dashboard env (#1628)
3d0c97f
iameskild and others added 13 commits July 20, 2023 09:59
@iameskild
Changes required for Jupyter-Scheduler integration (#1832)
46f7c24
@iameskild
Update upgrade command in preparation for release (#1868)
b90c5a7
@iameskild
Add release notes (#1870)
9bdf4ea
@aktech
Spinup spot instance for CI with cirun (#1882)
c538b3e
@iameskild
Fix argo-viewer service account reference (#1881)
63b613a
@aktech @pre-commit-ci
Framework for Nebari deployment via pytest for extensive testing (#1867)
006bbd4 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci @aktech
[pre-commit.ci] pre-commit autoupdate (#1878)
2dc82f2 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amit Kumar <dtu.amit@gmail.com>
@aktech @pre-commit-ci
Test GCP/AWS Deployment with Pytest (#1871)
fe23d04 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@iameskild
Add release notes for 2023.7.2, update release notes for 2023.7.1 (#1886
b597ddd 
)
@iameskild
Update upgrade command for 2023.7.2 (#1887)
eea2089
@aktech
Bump DigitalOcean provider to latest (#1891)
55ac555
@iameskild
Ensure path is Path object (#1888)
92af1cd
@iameskild
Merge 2023.7.2 into main, resolve conflicts
0a39c58
@iameskild iameskild added needs: review 👀 This PR is complete and ready for reviewing type: release 🏷 Items related to Nebari releases area:developer-experience 👩🏻‍💻 labels Aug 28, 2023
@iameskild iameskild requested a review from pavithraes August 28, 2023 16:43
This was linked to issues Aug 28, 2023
[RELEASE] 2023.7.2 hot-fix #1885
Closed
Resolve the divergence of main and develop branches #1912
Closed
@pavithraes
Copy link
Member

@iameskild - Several tests are failing, I think we'll need to take a closer look?

@iameskild
Copy link
Member Author

@pavithraes I believe the kubernetes test is going to fail regardless because these changes don't account for the JupyterHub upgrade and the deploy uses NEBARI_GH_BRANCH=main which is using the upgrade JupyterHub python app. Checking the workflow logs, we see the JupyterHub API health check fail at the end of the deployment which is expected.

The other CI should all be passing.

@pavithraes
Copy link
Member

pavithraes commented Sep 6, 2023 •
edited
Loading

Thanks, @iameskild!

While I didn't review all the files, I cross-checked the commits in this branch :)

@iameskild iameskild merged commit 6f7a93d into main Sep 6, 2023
@iameskild iameskild deleted the fix_1912 branch September 6, 2023 16:16
This was referenced Sep 6, 2023
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pavithraes pavithraes pavithraes approved these changes

Assignees
No one assigned
Labels
area:developer-experience 👩🏻‍💻 needs: review 👀 This PR is complete and ready for reviewing type: release 🏷 Items related to Nebari releases
Projects
🪴 Nebari Project Management
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Resolve the divergence of main and develop branches [RELEASE] 2023.7.2 hot-fix