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

Sync with upstream main and updated the image sha for 2.14 code freeze #398

Merged
merged 8 commits into from
Oct 6, 2024
Merged

Sync with upstream main and updated the image sha for 2.14 code freeze #398

merged 8 commits into from
Oct 6, 2024

Conversation

harshad16
Copy link
Member

Sync with upstream main and updated the image sha for 2.14 code freeze

Fixes: #397

  1. First 2 commit are synced from upstream ODH: main, with following commands:
git pull odh main --no-rebase
<fix conflicts>
commit
  1. Adjusted the r-studio base image, as we require 3.11 python based image.
  2. Fixed some annotation correction, this follow up of: Updated the notebook manifests with 2024b image reference #389
  3. updated imagestream image sha, as this github action failed: https://github.com/red-hat-data-services/notebooks/actions/runs/11191198152

harshad16 and others added 6 commits October 5, 2024 03:45
@harshad16 @dibryant
Set the manifests in right order with minor fixes (opendatahub-io#735)
da5d4bf 
* Set the manifests in right order with minor fixes

- Introduce ROCm based images to imagestream list
- Updated ROCm based images with amd.com/gpu annotation

Signed-off-by: Harshad Reddy Nalla <[email protected]>

* Adjust the annotation containing python package information

Signed-off-by: Harshad Reddy Nalla <[email protected]>

---------

Signed-off-by: Harshad Reddy Nalla <[email protected]>
Co-authored-by: Diamond Bryant <[email protected]>
@github-actions @harshad16
[Digest Updater Action] Update Notebook Images (opendatahub-io#736)
13dbeb3 
* Update images for release N via digest-updater-11191131900 GitHub action

* Update image commits for release N via digest-updater-11191131900 GitHub action

* Update images for release N-1 via digest-updater-11191131900 GitHub action

* Update image commits for release N-1 via digest-updater-11191131900 GitHub action

* Fix the code-server 2024b image in manifests

Signed-off-by: Harshad Reddy Nalla <[email protected]>

---------

Signed-off-by: Harshad Reddy Nalla <[email protected]>
Co-authored-by: GitHub Actions <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harshad Reddy Nalla <[email protected]>
@harshad16
Merge branch 'main' of https://github.com/opendatahub-io/notebooks in…
2d289e0 
…to rhoai-adjust-manifest
@harshad16
Adjust the base image for the r-studio builds
c0a6243 
Signed-off-by: Harshad Reddy Nalla <[email protected]>
@harshad16
Fix the annotation for standard datascience 2024b imagestream:
c3fb813 
Signed-off-by: Harshad Reddy Nalla <[email protected]>
@harshad16
Imagestream image sha updated with 2024b 69688c1 and 2024a 66ff88f
c77dfdc 
Signed-off-by: Harshad Reddy Nalla <[email protected]>
@openshift-ci openshift-ci bot requested review from caponetto and dibryant October 6, 2024 19:21
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 6, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from harshad16. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@harshad16 harshad16 force-pushed the rhoai-adjust-manifest branch from f92bdf0 to 064b974 Compare October 6, 2024 19:30
@harshad16
Copy link
Member Author

All the CI checks have passed.
Going to Merge it for code-freeze 2.14
Please feel free to review and comment, we can work on it on follow-up PRs.

@harshad16 harshad16 merged commit 8281296 into red-hat-data-services:main Oct 6, 2024
7 of 9 checks passed
@jstourac
Copy link
Member

jstourac commented Oct 7, 2024

updated imagestream image sha, as this github action failed: https://github.com/red-hat-data-services/notebooks/actions/runs/11191198152

Yep, this is the reason why in upstream I had this temporary workaround prepared to avoid necessity to do this manually. :)

@jstourac
Copy link
Member

jstourac commented Oct 7, 2024

lgtm, thank you for this, Harshad

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

@caponetto caponetto Awaiting requested review from caponetto

@dibryant dibryant Awaiting requested review from dibryant

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@harshad16 @jstourac