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

Sync main from opendatahub-io:main #489

Merged
merged 51 commits into from
Jan 16, 2025

Conversation

atheo89
Copy link
Member

@atheo89 atheo89 commented Jan 16, 2025

close: #452

jiridanek and others added 30 commits November 28, 2024 16:25
…ebooks Github Actions (opendatahub-io#775)

* RHOAIENG-16076: tests(gha): run Makefile tests in GitHub Actions

* fixup, looks like I lost the second changed line from opendatahub-io#761 (comment) when merging the work

* fixup, linter wants space in the comments; IntelliJ is ok with it, so let's do that

* fixup, add reference to OpenShift CI for the source of the make invocations

* fixup, the ifNotPresent pull policy (for PR checks without image registry) and the symbolic links apparently needed to deploy rocm stuff
…ter-12081993672

[Digest Updater Action] Update Notebook Images
…ter-12083776232

[Digest Updater Action] Update Runtimes Images
…an-docs

Remove Habana references from docs
… the whole repo, so we can start reusing code between images in the future (opendatahub-io#792)

* Update `COPY` commands in all not-intel Dockerfiles

* Update `COPY` commands in intel Dockerfiles too

* RHOAIENG-11274: chore(Makefile): widen the container build context to the whole repo, so we can start reusing code between images in the future

```python
import glob
import pathlib

def main():
    for dockerfile in glob.glob("**/Dockerfile", recursive=True):
        print(dockerfile)
        path = pathlib.Path(dockerfile)
        lines = path.read_text().splitlines()
        idx = lines.index("ARG SOURCE_CODE=.")
        lines[idx] = f"ARG SOURCE_CODE={str(path.parent)}"
        print("\t", lines[idx])
        path.write_text("\n".join(lines) + "\n")

if __name__ == '__main__':
    main()
```

* Adjust Makefile to build in `ROOT_DIR` and create .dockerignore to save time when initializing builds
…ner code using the improvements put into place just before (opendatahub-io#801)
Remove old obsolete files

Include codeserver notebook on the refresh-piplock-files recipe

Update refresh-pipfilelock-files to accept optional file directories for updates

Update documentation in regards the Pipfile lock generation
…AGS := -eu -o pipefail -c` in Makefile (opendatahub-io#791)

* RHOAIENG-16403: chore(Makefile): implement `.ONESHELL:` and `.SHELLFLAGS := -eu -o pipefail -c` in Makefile

* fixups for proper shell error handling
…slash (`\s*;?\s*\\$`) (opendatahub-io#808)

* RHOAIENG-16403: chore(Makefile): remove the now-unnecessary trailing `\s*;?\s*\\$`

* fix some wrongly indented lines

I wanted to ignore this until we switch to `>`, but it actually started causing CI build failures right now,
 so it must be fixed after all.
Make the pipfile renewal to work when cron firing
…70.0.0 for CVE fixes (opendatahub-io#807)

* updated setuptools to 70.0.0 for CVE fixes

* Update Pipfile.lock files by piplock-renewal.yaml action

* Update Pipfile.lock files by piplock-renewal.yaml action

---------

Co-authored-by: GitHub Actions <github-actions[bot]@users.noreply.github.com>
Adding my own GH handle (`andyatmiami`) to the `approvers` and `reviewers` section of `OWNERS`, honor alphanumeric sorting, so I can be more self-sufficient in working issues alongside the team.
NO-JIRA: chore(gha): run code-server playwright tests for pushes (and scheduled run) as well
NO-ISSUE: chore(owners): add myself as reviewer/approver
shalberd and others added 16 commits December 20, 2024 13:45
…, setting them in R global env file.

Also changed env var search to beginning-of-line regex format for all env vars.

Signed-off-by: shalberd <[email protected]>
Pin `jupyterlab` package to version `4.2.6`
…bench_container_proxyenv_vars_available_REnviron

RHOAIENG-16604: feat(RStudio): grab proxy-related env vars from container env context and set them in R default environment
…rkup_to_PDF_rendering_work

RHOAIENG-17256: install necessary base OS package to make Knit rendering of R markup to PDF possible
The current method of using `sed` to modify `kustomization.yaml` when running the `deploy9-` `Makefile` target runs into issues if the developer workstation is on MacOS.

Given the intended behavior here is to swap out a couple values in the `yaml` file - this PR adds `yq` as a self-contained dependency to the `Makefile` to handle this `yaml` modification.

The `bin/yq` target added to `Makefile` follows the existing conventions established around the `bin/kubectl` handling within the `Makefile`.
This commit adds `kubeflow-training[huggingface]` to the following workbench images:
- `./jupyter/datascience/ubi9-python-3.11`
- `./jupyter/pytorch/ubi9-python-3.11`
- `./jupyter/rocm/pytorch/ubi9-python-3.11`
- `./jupyter/trustyai/ubi9-python-3.11`
- `./codeserver/ubi9-python-3.11`

This outcome comes with a slew of caveats and disclaimers:
- Due to a dependency conflict, `codeflare-sdk==0.24.3` was **also** pulled into the following workbench images.
	- `./jupyter/datascience/ubi9-python-3.11`
	- `./jupyter/pytorch/ubi9-python-3.11`
	- `./jupyter/rocm/pytorch/ubi9-python-3.11`
	- `./jupyter/trustyai/ubi9-python-3.11`
- ⚠️ In what may be a "controversial" decision, `codeflare-sdk` was **NOT** updated on other workbench images.  Since `0.24.3` was a "one-off" release to unblock the `kubeflow-training` inclusion - the thought process here is that normal "sync" procedures on the next official release will standardize the `codeflare-sdk` dependency across all workbench images.  This allows us to restrict the testing effort of this commit.
    - However, as of opendatahub-io@2bd35f7, `codeflare-sdk` `0.24.3` was being pulled into our `Pipfile.lock` file - which is why you won't see `Pipfile.lock` addition of `codeflare-sdk` on **this PR**
- `jupyter/minmal/ubi9-python-3.11` was deliberately excluded from receiving `kubeflow-training` per discussions with team.
- Due to dependency conflicts discovered `tensorflow`-based workbench images,`kubeflow-training` has not been added to those workbench images at this time.  This decision was agreed to by affect stakeholders.  Core blocking issue can be seen here:
	- See #2328 in https://github.com/onnx/tensorflow-onnx/issues
- Due to a dependency conflict, `transformers = "==4.38.0"` was **also** added to the`./jupyter/trustyai/ubi9-python-3.11` workbench image after discussion with the developer that last worked on the `trustyai` image.  While it certainly must be tested, there was no strict requirement that necessitated pinning the `transformers` dependency to `4.36.2` - and the `huggingface` `extras` now introduces a `4.38.0` constraint for `transformers`.

Related-to: https://issues.redhat.com/browse/RHOAIENG-12822
…-python-sdk

feat(deps): add kubeflow-training to workbench images
…-in-deploy-target

NO-JIRA: fix(build): use yq to modify kustomization.yaml during deploy targets
Updated notebooks via odh-sync-updater-12711100946 GitHub action
* Update codeflare version on imagestreams

* Add kubeflow-training package into imagestreams
@atheo89 atheo89 force-pushed the sync-downstream-main branch from 5427926 to 8f0f3ef Compare January 16, 2025 13:20
@jiridanek
Copy link
Member

/lgtm
I can try to fix the poetry.lock later

@atheo89
Copy link
Member Author

atheo89 commented Jan 16, 2025

/approve

Copy link

openshift-ci bot commented Jan 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atheo89

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

@atheo89 atheo89 merged commit 013350d into red-hat-data-services:main Jan 16, 2025
22 of 28 checks passed
@atheo89 atheo89 deleted the sync-downstream-main branch March 14, 2025 17:19
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.

8 participants