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

Merge smarter jupyter values #2803

Conversation

andrewballantyne
Copy link
Member

@andrewballantyne andrewballantyne commented May 10, 2024

https://issues.redhat.com/browse/RHOAIENG-7070

Description

Improves the merging of env values provided as part of the Jupyter Tile.

How Has This Been Tested?

  1. Don't have a Jupyter Tile Notebook
    • delete Notebook, PVC, and configmap under your name
    • Find the namespace these are in by checking the OdhDashboardConfig -- if a notebookNamespace is set, go there, if not it's in the Dashboard's namespace
  2. Create a Jupyter Tile Notebook
  3. Stop the Notebook after it creates (this flow is not part of this fix)
  4. Add an env var and start the Notebook again

It failed after the 2nd start (no4 above) with an error in the modal -- if it continues to deploy, the fix is successful.

Test Impact

Wrote tests for the customizer function used in lodash mergeWith

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 or cypress tests 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 (find relevant UX in the SMEs section).

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

@christianvogt
Copy link
Contributor

/lgtm
/approve

Copy link
Contributor

openshift-ci bot commented May 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: christianvogt, gitdallas

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

@codecov-commenter
Copy link

codecov-commenter commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (main@baa33fc). Click here to learn what that means.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2803   +/-   ##
=======================================
  Coverage        ?   77.25%           
=======================================
  Files           ?     1072           
  Lines           ?    22417           
  Branches        ?     5666           
=======================================
  Hits            ?    17318           
  Misses          ?     5099           
  Partials        ?        0           

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update baa33fc...895c60f. Read the comment docs.

@harshad16
Copy link
Member

harshad16 commented May 10, 2024

Tested this on my cluster:
Screenshot from 2024-05-10 14-59-42

  1. Work well for the addition of env var
  2. Has issues in subtraction.
    Error: couldn't find key en1 in ConfigMap redhat-ods-applications/jupyterhub-singleuser-profile-hnalla-40redhat-2ecom-envs
    Screenshot from 2024-05-10 15-08-17

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold This PR is hold for some reason label May 10, 2024
@andrewballantyne andrewballantyne removed do-not-merge/hold This PR is hold for some reason lgtm approved labels May 10, 2024
@harshad16
Copy link
Member

The Changes works for both addition and substraction 💯
/lgtm

@openshift-ci openshift-ci bot added the lgtm label May 10, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 22dc16b into opendatahub-io:main May 10, 2024
6 checks passed
@andrewballantyne andrewballantyne deleted the fix-jupyter-tile-envs branch June 26, 2024 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants