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

Rebase VSCode to UBI9 instead on C9S #319

Merged
merged 1 commit into from
Nov 14, 2023

Conversation

atheo89
Copy link
Member

@atheo89 atheo89 commented Nov 8, 2023

This PR rebases the VSCode to UBI9 instead on C9S. The reason is to facilitate the QE testing on upstream as well as will facilitate the meintenance among both streams.

Description

The functionality on the VSCode remains the same as in C9S

NOTE: OCP-CI change -> openshift/release#45451

How Has This Been Tested?

The behavior of the notebook looks the same as the one based on C9S.

1. On a Local Run

  1. Build the notebook: make codeserver-ubi9-python-3.9

  2. Run the VSCode locally:
    podman run --network=host --name validation-container quay.io/opendatahub/workbench-images:codeserver-ubi9-python-3.9-pr-319

  3. On the terminal's logs there is the HTTP Server listening URL: http://0.0.0.0:8787/
    Need to press it in order to lunch the notebook

image

Once you finish the inspection: podman stop validation-container && podman rm validation-container

2. On the Cluster

Deploy on the cluster: make deploy9-codeserver-ubi9-python-3.9
Run the Test: make validate-codeserver-image image=codeserver-ubi9-python-3.9-pr-319 ensure that the test completed successfully
Undeploy: make undeploy9-codeserver-ubi9-python-3.9

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@atheo89
Copy link
Member Author

atheo89 commented Nov 8, 2023

/hold

@atheo89
Copy link
Member Author

atheo89 commented Nov 8, 2023

/unhold

@jstourac
Copy link
Member

jstourac commented Nov 9, 2023

The reason is to facilitate the QE testing on upstream as well as will facilitate the meintenance among both streams.

I would say that not only that - having this on UBI means:

  • a little smaller result image
  • unifies with all other existing images since these are build on UBI too

@atheo89
Copy link
Member Author

atheo89 commented Nov 9, 2023

The reason is to facilitate the QE testing on upstream as well as will facilitate the meintenance among both streams.

I would say that not only that - having this on UBI means:

  • a little smaller result image
  • unifies with all other existing images since these are build on UBI too

Thanks Jan!

Copy link
Member

@jstourac jstourac left a comment

Choose a reason for hiding this comment

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

LGTM

btw - thank you for the verification steps, it was really helpful so one doesn't have to figuring these things out! 👍

@openshift-ci openshift-ci bot added lgtm and removed lgtm labels Nov 9, 2023
@harshad16
Copy link
Member

Thanks for the work.
/lgtm

Providing my lgtm, i have one note
with the commit c15d4f7
we are changing the workdir to workspace.
if user keeps working on this dir, they would run of space, as PVC is mount on /opt/app-root/src.
we can get this in feature freeze and keep testing this.

@openshift-ci openshift-ci bot added lgtm and removed lgtm labels Nov 10, 2023
@atheo89
Copy link
Member Author

atheo89 commented Nov 10, 2023

i have one note with the commit c15d4f7 we are changing the workdir to workspace. if user keeps working on this dir, they would run of space, as PVC is mount on /opt/app-root/src. we can get this in feature freeze and keep testing this.

@harshad16 Thanks a lot for raising this concern, I hadn't test this last change on cluster, and indeed you were right. When a user start up the notebook there was a popup window with the message: Workspace does not exists Like the print screen below, so, the user had to switch back to /src

image

So, I removed the old one and directed it to /opt/app-root/src/lost+found (as is also on the jupyter notebooks) . With this change is working as expected. No popup windows on the startup:

image

Testing part

I have created a test branch with this change on my repo to test it on the cluster. You can utilize the following part on the DSC to check that change.

    workbenches:
      devFlags:
        manifests:
          - contextDir: components/odh-notebook-controller/config
            sourcePath: ''
            uri: 'https://github.com/opendatahub-io/kubeflow/tarball/v1.7.0-5'
          - contextDir: components/notebook-controller/config
            sourcePath: ''
            uri: 'https://github.com/opendatahub-io/kubeflow/tarball/v1.7.0-5'
          - contextDir: manifests
            sourcePath: ''
            uri: 'https://github.com/atheo89/notebooks/tarball/workdir-change'
      managementState: Managed

Or, you can replace the generated image from this PR quay.io/opendatahub/workbench-images@sha256:e1fec835ee3f8ecb8e9380fb23992a7b37876e8b7164b773c95872f47baa688c inside the code-server imagestream directly into the cluster. (I didn't try this way)

@atheo89
Copy link
Member Author

atheo89 commented Nov 10, 2023

Open this Fix in ocp-ci for the e2e failure -> openshift/release#45567

@atheo89
Copy link
Member Author

atheo89 commented Nov 13, 2023

/test notebooks-e2e-tests

@atheo89
Copy link
Member Author

atheo89 commented Nov 13, 2023

Hi folks, I removed the last changes in regards the redirection to lost&found, as we discussed, these can be included a later as bug fixes. Could you take a last review?

Copy link
Contributor

openshift-ci bot commented Nov 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: jstourac

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-bot openshift-merge-bot bot merged commit 50e11ac into opendatahub-io:main Nov 14, 2023
6 checks passed
jstourac pushed a commit to jstourac/notebooks that referenced this pull request Aug 12, 2024
[pull] release-2023b from opendatahub-io:2023b
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.

3 participants