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

[ENH] - Include "--attempt-fixes" flag from Nebari upgrade CLI in upgrade steps logic #2839

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open

[ENH] - Include "--attempt-fixes" flag from Nebari upgrade CLI in upgrade steps logic #2839

wants to merge 44 commits into from
+363 −87

Conversation

smokestacklightnin
Copy link

@smokestacklightnin smokestacklightnin commented Nov 10, 2024 •
edited by viniciusdc
Loading

Reference Issues or PRs

This resolves #2761 by passing the attempt_fixes variable from the command line option to the upgrade methods.
close #2761

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):

Testing

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

How to test this PR?

Run nebari upgrade --attempt-fixes and verify that the upgrade is successful without prompts from the user.

Any other comments?

@smokestacklightnin smokestacklightnin force-pushed the commands/upgrade/attempt-fix-logic branch 4 times, most recently from 2b5260e to d053d04 Compare November 11, 2024 01:18
@smokestacklightnin smokestacklightnin marked this pull request as ready for review November 11, 2024 01:43
@dcmcand
Copy link
Contributor

dcmcand commented Nov 11, 2024

This should probably be a draft PR if you still have questions about the implementation

@dcmcand dcmcand marked this pull request as draft November 11, 2024 08:59
@smokestacklightnin smokestacklightnin force-pushed the commands/upgrade/attempt-fix-logic branch from d053d04 to 47df80c Compare November 15, 2024 03:59
marcelovilla
marcelovilla requested changes Nov 15, 2024
View reviewed changes
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
src/_nebari/upgrade.py Show resolved Hide resolved
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
src/_nebari/upgrade.py Outdated Show resolved Hide resolved
@marcelovilla
Copy link
Member

@smokestacklightnin can you also make sure the tests are passing?

@smokestacklightnin
Autoformat from Black
28db7be
@smokestacklightnin
Add attempt_fixes parameter to UpgradeStep.upgrade_step and `Upgr…
f387e4b 
…adeStep._version_specific_upgrade`
@smokestacklightnin
Add attempt_fixes to UpgradeStep.replace_image_tag and `UpgradeSt…
06598c7 
…ep.update_image_tag`
@smokestacklightnin
Add attempt_fixes to Upgrade_2023_4_2._version_specific_upgrade
3bf0d4d
@smokestacklightnin
Add attempt_fixes to Upgrade_2023_7_2._version_specific_upgrade
a312463
@smokestacklightnin
Add attempt_fixes to Upgrade_2024_4_1._version_specific_upgrade
0359281
@smokestacklightnin
Add attempt_fixes to Upgrade_2024_6_1._version_specific_upgrade
a1eefe2
@smokestacklightnin
Add attempt_fixes to Upgrade_2024_11_1._version_specific_upgrade
2ee366c
@smokestacklightnin
Remove unnecessary argument
a6a0364
@smokestacklightnin
Remove unnecessary "[y/N]"
804edfd
@smokestacklightnin
Use attempt_fixes from kwargs
8f8215a
@smokestacklightnin
Remove unnecessary default value
6fc2dea
@smokestacklightnin
Remove unnecessary inclusion of attempt_fixes
48a5ae4
@smokestacklightnin
Refactor Argo delete commands
38e5a48
@smokestacklightnin
Fix quotation marks
239c419
@smokestacklightnin smokestacklightnin force-pushed the commands/upgrade/attempt-fix-logic branch from 4807612 to 239c419 Compare November 20, 2024 07:13
@smokestacklightnin smokestacklightnin force-pushed the commands/upgrade/attempt-fix-logic branch from adade08 to d7520ed Compare November 21, 2024 07:39
@smokestacklightnin
Squashed commit of the following:
c5f02e3 
commit bbbcde3
Merge: ce71236 3ac01b4
Author: Marcelo Villa <[email protected]>
Date:   Thu Nov 28 14:42:36 2024 -0500

    Disable `jupyterlab-jhub-apps` extension when jhub-apps is disabled (nebari-dev#2804)

commit ce71236
Author: Vinicius D. Cerutti <[email protected]>
Date:   Thu Nov 21 13:53:57 2024 -0300

    Add 2024.11.1 release notes and bump version (nebari-dev#2859)

commit d272176
Merge: b442200 bbff007
Author: Marcelo Villa <[email protected]>
Date:   Wed Nov 20 08:56:51 2024 -0500

    Use tofu binary instead of terraform one (nebari-dev#2773)

commit bbff007
Merge: 0ecf6ef b442200
Author: Marcelo Villa <[email protected]>
Date:   Tue Nov 19 08:55:47 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 3ac01b4
Merge: a0bceea 621ea23
Author: Chuck McAndrew <[email protected]>
Date:   Mon Nov 18 19:13:53 2024 +0100

    Merge branch 'main' into disable-jupyterlab-jhub-apps-extension

commit 0ecf6ef
Merge: a40cd40 621ea23
Author: Marcelo Villa <[email protected]>
Date:   Thu Nov 14 16:32:07 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit a40cd40
Merge: 8e59c24 e7ff089
Author: Chuck McAndrew <[email protected]>
Date:   Thu Nov 14 21:35:20 2024 +0100

    specify terraform registry for providers not in opentofu registry (nebari-dev#2852)

commit e7ff089
Author: Chuck McAndrew <[email protected]>
Date:   Thu Nov 14 17:56:35 2024 +0100

    only update kind

commit 6f1b8d6
Merge: b2dd11c 8e59c24
Author: Chuck McAndrew <[email protected]>
Date:   Wed Nov 13 18:03:11 2024 +0100

    Merge branch 'terraform-to-opentofu' into 2857-fix-providers

commit 8e59c24
Merge: ff29935 87ed92b
Author: Marcelo Villa <[email protected]>
Date:   Wed Nov 13 10:16:32 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit b2dd11c
Merge: 415b136 ff29935
Author: Marcelo Villa <[email protected]>
Date:   Wed Nov 13 10:15:25 2024 -0500

    Merge branch 'terraform-to-opentofu' into 2857-fix-providers

commit 415b136
Author: Chuck McAndrew <[email protected]>
Date:   Wed Nov 13 13:44:29 2024 +0100

    specify terraform registry for providers not in opentofu registry

commit ff29935
Merge: aef2796 855aa14
Author: Marcelo Villa <[email protected]>
Date:   Wed Nov 6 13:29:43 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit aef2796
Merge: 06f9043 3429260
Author: Chuck McAndrew <[email protected]>
Date:   Wed Nov 6 16:26:34 2024 +0100

    Merge branch 'main' into terraform-to-opentofu

commit a0bceea
Author: krassowski <[email protected]>
Date:   Thu Oct 31 12:56:20 2024 +0000

    Fix typo

commit b8530d6
Author: krassowski <[email protected]>
Date:   Tue Oct 29 13:56:56 2024 +0000

    Mount `page_config.json` in top-level

    so that it applies across potential JupyterLab startup environments

    also the previous spec was incorrectly pointing to a file (not a dir)

commit d1572eb
Author: krassowski <[email protected]>
Date:   Tue Oct 29 10:43:29 2024 +0000

    Disable `jupyterlab-jhub-apps` extension when jhub-apps is disabled (if installed)

commit 06f9043
Merge: 8f709da ba0ae82
Author: Marcelo Villa <[email protected]>
Date:   Fri Oct 25 03:28:49 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 8f709da
Author: Marcelo Villa <[email protected]>
Date:   Thu Oct 17 08:03:09 2024 +0200

    Fix wrong function reference

commit 2b8c347
Merge: 80d67b9 c2ae895
Author: Marcelo Villa <[email protected]>
Date:   Wed Oct 16 23:36:10 2024 +0200

    Merge branch 'terraform-to-opentofu' of https://github.com/nebari-dev/nebari into terraform-to-opentofu

commit 80d67b9
Author: Marcelo Villa <[email protected]>
Date:   Wed Oct 16 23:36:01 2024 +0200

    Rename terraform.py file and terraform_init calls

commit c2ae895
Merge: 6a09d4e ccb8b7e
Author: Marcelo Villa <[email protected]>
Date:   Wed Oct 16 08:16:50 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 6a09d4e
Merge: d1dfabe 38960ea
Author: Marcelo Villa <[email protected]>
Date:   Tue Oct 15 04:54:16 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit d1dfabe
Author: Marcelo Villa <[email protected]>
Date:   Tue Oct 15 11:53:49 2024 +0200

    Remove terraform open source license test

commit 96609c8
Author: Marcelo Villa <[email protected]>
Date:   Mon Oct 14 23:00:05 2024 +0200

    Use tofu binary instead of terraform one
@smokestacklightnin
Remove stage files
04b96e0
@smokestacklightnin
Remove stage directories
3722cab
@smokestacklightnin
Add verbose argument
62e1603
@smokestacklightnin
Remove root stages dir
2869914
@smokestacklightnin
Remove Terraform scripts in 2023_10_1 upgrade
e561497
@smokestacklightnin
Refactor confirmation string
5fffbde
@smokestacklightnin
Remove Terraform scripts in 2023_11_1 upgrade
f2088e2
@smokestacklightnin
Remove Terraform scripts in 2023_12_1 upgrade
e9699ea
@smokestacklightnin
Remove Terraform scripts in 2024_1_1 upgrade
77ae962
@smokestacklightnin
Remove directory only if it exists and is empty
40b4660
@marcelovilla
Copy link
Member

@smokestacklightnin can you make sure tests are passing? Then, I'll review the whole PR

@viniciusdc
Copy link
Contributor

viniciusdc commented Dec 12, 2024 •
edited
Loading

Updated description with closing tag for the related issue

@smokestacklightnin smokestacklightnin marked this pull request as ready for review December 19, 2024 20:15
@smokestacklightnin
Copy link
Author

smokestacklightnin commented Dec 19, 2024 •
edited
Loading

@marcelovilla All tests are passing. There is only one test that fails because it needs monkeypatching (CC: @viniciusdc). I have xfailed it for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcmcand dcmcand dcmcand left review comments

@marcelovilla marcelovilla Awaiting requested review from marcelovilla

@viniciusdc viniciusdc Awaiting requested review from viniciusdc

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
🪴 Nebari Project Management
Status: Changes requested 🧱
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[ENH] - Include "--attempt-fixes" flag from Nebari upgrade CLI in upgrade steps logic
4 participants
@smokestacklightnin @dcmcand @marcelovilla @viniciusdc