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

Remove JupyterHub dependencies #1211

Conversation

DaoDaoNoCode
Copy link
Member

@DaoDaoNoCode DaoDaoNoCode commented May 9, 2023

Closes #534

Description

Remove dependencies related to JupyterHub, most of the YAML docs updates will be addressed in #1636

How Has This Been Tested?

  1. Make sure you installs the apps and docs in updated manifests/apps/jupyter and make sure your cluster has removed jupyterhub OdhApplication CR
  2. Set enabled to true in notebookController field in the dashboard config CR
  3. Make sure everything works as normal
  4. Set enabled to false in notebookController field in the dashboard config CR, and wait for 2 mins
  5. Make sure you cannot see any docs, quickstart on the Resources page, Make sure you cannot see the Jupyter app card on the Enabled and Explore page
  6. Make sure you cannot access the notebook controller via URL
  7. Make sure the Launch Jupyter button is hidden on the data science projects table
  8. Make sure the toleration settings section is hidden in the cluster settings

Test Impact

N/A

Request review criteria:

Self checklist (all need to be checked):

  • The developer has manually tested the changes and verified that the changes work
  • Commits have been squashed into descriptive, self-contained units of work (e.g. 'WIP' and 'Implements feedback' style messages have been removed)
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has added tests or explained why testing cannot be added (unit tests & storybook for related changes)

If you have UI changes:

  • Included any necessary screenshots or gifs if it was a UI change.
  • Included tags to the UX team if it was a UI/UX change.

After the PR is posted & before it merges:

  • The developer has tested their solution on a cluster by using the image produced by the PR to main

@DaoDaoNoCode
Copy link
Member Author

/hold Might want to wait until https://github.com/opendatahub-io/odh-manifests/issues/805 is solved.

@openshift-ci openshift-ci bot added the do-not-merge/hold This PR is hold for some reason label May 9, 2023
@DaoDaoNoCode DaoDaoNoCode changed the title [DO NOT MERGE]: Remove JupyterHub dependencies Remove JupyterHub dependencies May 15, 2023
@lucferbux lucferbux added do-not-merge/hold This PR is hold for some reason and removed do-not-merge/hold This PR is hold for some reason labels Jun 5, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase PR needs to be rebased label Jun 16, 2023
@lucferbux
Copy link
Contributor

/hold

@DaoDaoNoCode are we gonna wait until we find the right text for the quickstart right?

@DaoDaoNoCode
Copy link
Member Author

@lucferbux Yes, I will hold this PR until next release.

@lucferbux
Copy link
Contributor

@DaoDaoNoCode I think we can unhold this now, but it would need a rebase

@lucferbux
Copy link
Contributor

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold This PR is hold for some reason label Aug 28, 2023
@DaoDaoNoCode
Copy link
Member Author

@lucferbux I think I still need to make some changes to the PR, looks like they don't want to remove the enable flag in notebookController config because I saw some customers are still using it to hide the Jupyter tile card. I will update this PR later.

docs/dashboard_config.md Outdated Show resolved Hide resolved
@openshift-merge-robot openshift-merge-robot removed the needs-rebase PR needs to be rebased label Aug 29, 2023
@DaoDaoNoCode DaoDaoNoCode changed the base branch from main to f/notebook-controller August 29, 2023 20:13
@andrewballantyne andrewballantyne added the pr/no-tests-allowed Added by an official approver - this PR is allowed no tests. Omitted, a test must accompany the PR label Sep 7, 2023
@DaoDaoNoCode DaoDaoNoCode force-pushed the upstream-issue-534 branch 2 times, most recently from 2b7334d to de57c10 Compare September 7, 2023 17:53
@DaoDaoNoCode
Copy link
Member Author

@lucferbux I have updated the PR and it's ready for review!

Copy link
Contributor

@lucferbux lucferbux left a comment

Choose a reason for hiding this comment

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

Check the logic, maybe you can install more resources to make it more explicit, I got all the resources we have for rhods in odh-manifest and isntalled all of them in opendatahub.

@@ -8,7 +8,7 @@ export const listComponents = async (
request: FastifyRequest,
): Promise<OdhApplication[]> => {
const applications = getApplications().filter(
(component) => component.metadata.name !== (checkJupyterEnabled() ? 'jupyterhub' : 'jupyter'),
(component) => !checkJupyterEnabled() && component.metadata.name !== 'jupyter',
Copy link
Contributor

Choose a reason for hiding this comment

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

Same with this check, we might want to filter jupyter IF notebook controller is not enable, this will make all the applications dissapear if you have notebook controller enabled

backend/src/routes/api/docs/list.ts Outdated Show resolved Hide resolved
backend/src/routes/api/quickstarts/list.ts Outdated Show resolved Hide resolved
backend/src/utils/resourceUtils.ts Show resolved Hide resolved
frontend/src/app/AppRoutes.tsx Show resolved Hide resolved
@lucferbux
Copy link
Contributor

Ok, removing checkJupyterEnabled migth be tricker than I thought cause it might need a migration upgrade path. In that case, we might wanna either create a new ticket or get that with #1108

Copy link
Contributor

@lucferbux lucferbux left a comment

Choose a reason for hiding this comment

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

Just a couple of nits

frontend/src/app/AppRoutes.tsx Show resolved Hide resolved
@@ -59,7 +61,10 @@ const AppRoutes: React.FC = () => {

<Route path="/projects/*" element={<ProjectViewRoutes />} />

<Route path="/notebookController/*" element={<NotebookController />} />
{isJupyterEnabled && (
<Route path="/notebookController/*" element={<NotebookController />} />
Copy link
Contributor

Choose a reason for hiding this comment

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

If we are hiding away /notebookController, why aren't we hiding the workbenches section in projects?

Copy link
Member Author

Choose a reason for hiding this comment

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

The /notebookController is only the Jupyter tile on the Enabled page, it's nothing to do with the project workbenches, they are different features.

Copy link
Contributor

Choose a reason for hiding this comment

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

mmmm so we don't have a way to hide workbenches right now in projects?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we have a way to do that, we can only disable projects, but not the workbench section only.

backend/src/routes/api/quickstarts/list.ts Show resolved Hide resolved
Copy link
Contributor

@lucferbux lucferbux left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 21, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lucferbux

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 10ad0e6 into opendatahub-io:f/notebook-controller Sep 21, 2023
3 checks passed
@shalberd shalberd mentioned this pull request Nov 9, 2023
7 tasks
@shalberd
Copy link
Contributor

shalberd commented Nov 9, 2023

nice work, thank you all.

@DaoDaoNoCode especially so the Jupyterhub-Tile disappears (even the Applications menu if no applications are in that section?) when notebookController.enabled is set to false.

@lucferbux Out of curiosity: Does the applications menu disappear in the GUI when there are no Applications / OdhApplications present at all?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm pr/no-tests-allowed Added by an official approver - this PR is allowed no tests. Omitted, a test must accompany the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove JH References
6 participants