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

Merge develop into main for 2024.3.3 release #2364

Merged
merged 47 commits into from
Mar 27, 2024
Merged

Merge develop into main for 2024.3.3 release #2364

merged 47 commits into from
Mar 27, 2024

Conversation

viniciusdc
Copy link
Contributor

@viniciusdc viniciusdc commented Mar 27, 2024 •
edited
Loading

Reference Issues or PRs

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
  • Release
  • Other (please describe):

Testing

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

Any other comments?

isumitjha and others added 30 commits March 5, 2024 23:31
@isumitjha
Upgrade Actions versions
eb6155f
@isumitjha
update miniconda action, kubectl action as well
c05b7d3
@isumitjha
fix upload artifact action name
2834115
@isumitjha
fix azure version
31cb5e4
@tylergraff
upgrade auth0-python version to ultimately resolve CVE-2024-26130
af6a0b7
@tylergraff
due to dependency conflicts cve-2024-26130 can be fixed in Nebari onl…
e15a7ec 
…y for python>=3.10
@dcmcand
update ruamel.yaml
2092595
@Adam-D-Lewis @viniciusdc
get default variable value when following a terraform variable (#2322)
366d1cd 
Co-authored-by: Vinicius D. Cerutti <[email protected]>
@isumitjha
Upgrade Actions versions
9c87660
@aktech
Fix loki gateway url when deployed on non-dev namespace
142a217
@dcmcand
Upgrade Actions versions (#2291)
a06fcc5
@aktech
Merge branch 'develop' into loki-gateway-namespace
91fbf1a
@krassowski
Cleanup spawner logs (#2328)
a934899
@dcmcand
update ruamel.yaml
d4af7a2
@dcmcand
update ruamel.yaml
15bb87e
@dcmcand
Merge remote-tracking branch 'origin/main' into dmcandrew-update-ruam…
729d9da 
…el.yaml
@dcmcand
update ruamel.yaml
3c42cb5
@dcmcand
update ruamel.yaml
da35f8b
@dcmcand
Diverging Main/Develop (#2335)
9f945c4
@dcmcand
update python version tests
47e4f15
@dcmcand
update python version tests
544119f
@dcmcand
update dependencies
6480294
@dcmcand
Merge branch 'develop' into dmcandrew-update-ruamel.yaml
044021e
@dcmcand
add python 3.12 test
d07b7e4
@dcmcand
pin packages
30cd7ea
@aktech
Merge branch 'develop' into loki-gateway-namespace
0a00024
@dcmcand
Fix loki gateway url when deployed on non-dev namespace (#2327)
13923e4
@dcmcand
remove python 3.12 until further tested
0e4c2e5
@dcmcand
update python-keycloak version
76df3d4
@dcmcand
Merge branch 'develop' into dmcandrew-update-ruamel.yaml
583307e
dcmcand and others added 17 commits March 19, 2024 10:05
@dcmcand
add test for nebari
d4a4ad5
@dcmcand
add test for nebari
3363e90
@dcmcand
add test for nebari
3024107
@dcmcand
add test for nebari
6eeb2e0
@dcmcand
add test for nebari
3f55377
@dcmcand
Dmcandrew update ruamel.yaml (#2315)
c2528dd
@Adam-D-Lewis
remove depracated code paths (#2349)
d698630
@dcmcand
Create SECURITY.md
c4dc7d0
@dcmcand @krassowski
Update SECURITY.md
72ff6f9 
Co-authored-by: Michał Krassowski <[email protected]>
@dcmcand
update security.md
811806a
@dcmcand
Create SECURITY.md (#2354)
f1e37c2
@Adam-D-Lewis @sblair-metrostar
Set node affinity for more pods to ensure they run on general node po…
3b318a6 
…ol (#2353)

Co-authored-by: Scott Blair <[email protected]>
@krassowski
Deduplicate conda-store in JupyterLab main menu (#2347)
0ff7b7c
@krassowski @viniciusdc
Pass current namespace to argo via environment variable (#2317)
9b9b6bc 
Co-authored-by: Vinicius D. Cerutti <[email protected]>
@kenafoster
PVC for Traefik Ingress (prevent LetsEncrypt throttling) (#2352)
ac9ecbc
@viniciusdc @pre-commit-ci
New upgrade step for 2024.3.3 (#2356)
3e1dfde 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@viniciusdc @pre-commit-ci
Update release notes for 2024.3.3 (#2362)
bfa4548 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@viniciusdc
Copy link
Contributor Author

This is now only required to keep main up to date.

@viniciusdc viniciusdc requested a review from dcmcand March 27, 2024 21:07
@viniciusdc viniciusdc merged commit 6bb7626 into main Mar 27, 2024
57 checks passed
viniciusdc added a commit that referenced this pull request Mar 27, 2024
@viniciusdc
Revert "Merge develop into main for 2024.3.3 release (#2364)"
e2d2327 
This reverts commit 6bb7626.
@viniciusdc viniciusdc mentioned this pull request Mar 27, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcmcand dcmcand dcmcand approved these changes

@marcelovilla marcelovilla marcelovilla approved these changes

Assignees
No one assigned
Labels
None yet
Projects
🪴 Nebari Project Management
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@viniciusdc @dcmcand @marcelovilla @isumitjha @tylergraff @Adam-D-Lewis @aktech @krassowski @kenafoster