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

3/11/2025 Sync with upstream master #524

Merged

Conversation

hdefazio
Copy link

@hdefazio hdefazio commented Mar 11, 2025

What this PR does / why we need it:
Sync the oldest 15 commits needed from upstream/master (All these commits are empty because they were previously cherry picked - this PR is just to fix the history)
RHOAIENG-20223

Feature/Issue validation/testing:
All unit tests pass

Re-running failed tests

  • /rerun-all - rerun all failed workflows.
  • /rerun-workflow <workflow name> - rerun a specific failed workflow. Only one workflow name can be specified. Multiple /rerun-workflow commands are allowed per comment.

greenmoon55 and others added 16 commits December 23, 2024 14:35
* squash commits

Signed-off-by: Jin Dong <[email protected]>

* localmodel agent -> localmodelnode agent

Signed-off-by: Jin Dong <[email protected]>

* Revert change

Signed-off-by: Jin Dong <[email protected]>

---------

Signed-off-by: Jin Dong <[email protected]>
* Fix model server fails to gracefully shutdown

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>

* Update unit tests

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>

---------

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>
Co-authored-by: Dan Sun <[email protected]>
kserve#4152)

Ensure root model directory exists and add protection for # of jobs created

Signed-off-by: Dan Sun <[email protected]>
* updated package versions

Signed-off-by: ayush <[email protected]>

* updated go.mod and pip

Signed-off-by: ayush <[email protected]>

* updated poetry lock

Signed-off-by: ayush <[email protected]>

* refactored handling of task argument

Signed-off-by: ayush <[email protected]>

* removed go.mod changes

Signed-off-by: ayush <[email protected]>

---------

Signed-off-by: ayush <[email protected]>
* Add workflow for verifying go mod

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>

* Merge with go lint workflow

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>

---------

Signed-off-by: Sivanantham Chinnaiyan <[email protected]>
Co-authored-by: Dan Sun <[email protected]>
upgrade aiohttp

Signed-off-by: Andrews Arokiam <[email protected]>
Co-authored-by: Dan Sun <[email protected]>
* Allow other engine builds other than docker

chore:	This change will allow user to use other engine builds.
	In addition, for Podman/Buildah engine builder, users can
	set the target architecture, useful when using ARM and
	there is a need to build x86 Container images.
	Can be done with `ENGINE=podman ARCH="--arch x86_64" make docker...`

Signed-off-by: Spolti <[email protected]>

* review changes

Signed-off-by: Spolti <[email protected]>

---------

Signed-off-by: Spolti <[email protected]>
* Fixes Non-linear parsing of case-insensitive content

chore:	Fixes CVE-2024-45338 Non-linear parsing of case-insensitive content in golang.org/x/net/html
	https://github.com/kserve/kserve/security/dependabot/1871

Signed-off-by: Spolti <[email protected]>

* update go.sum

Signed-off-by: Spolti <[email protected]>

---------

Signed-off-by: Spolti <[email protected]>
* Helm chart - option to run daemonset as root

Signed-off-by: Jin Dong <[email protected]>

* make generate

Signed-off-by: Jin Dong <[email protected]>

* Revert default values

Signed-off-by: Jin Dong <[email protected]>

* Fix job count test

Signed-off-by: Dan Sun <[email protected]>

---------

Signed-off-by: Jin Dong <[email protected]>
Signed-off-by: Dan Sun <[email protected]>
Co-authored-by: Dan Sun <[email protected]>
Replace nodeGroup with nodeGroups

Signed-off-by: Rituraj Singh <[email protected]>
Co-authored-by: Rituraj Singh <[email protected]>
* Add affinity and tolerations to localmodel daemonset

Signed-off-by: Jin Dong <[email protected]>

* make generate

Signed-off-by: Jin Dong <[email protected]>

---------

Signed-off-by: Jin Dong <[email protected]>
…#4157)

* sets virtual addressing style for legacy s3 endpoint

Signed-off-by: bentohset <[email protected]>

* add unit test

Signed-off-by: bentohset <[email protected]>

* fix formatting

Signed-off-by: bentohset <[email protected]>

* fix unit tests

Signed-off-by: bentohset <[email protected]>

---------

Signed-off-by: bentohset <[email protected]>
Co-authored-by: Lize Cai <[email protected]>
@hdefazio hdefazio requested review from andresllh and mholder6 March 11, 2025 14:30
@andresllh
Copy link
Member

andresllh commented Mar 12, 2025

just update master branch locally and have a copy of it in case this breaks anything

@andresllh
Copy link
Member

/lgtm

@spolti
Copy link
Member

spolti commented Mar 12, 2025

/approve

1 similar comment
@Jooho
Copy link

Jooho commented Mar 12, 2025

/approve

@Jooho Jooho added the approved label Mar 12, 2025
Copy link

openshift-ci bot commented Mar 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: andresllh, hdefazio, Jooho, spolti

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 a009547 into opendatahub-io:master Mar 12, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.