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 from upstream master #506

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

VedantMahabaleshwarkar
Copy link

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # https://issues.redhat.com/browse/RHOAIENG-19207

  • cherry-picked commits from upstream up to kserve@5aedc95
  • further commits include the kserve gatewayapi changes which include a lot of conflicts with ODH kserve raw logic, we need working e2e tests to verify those changes so I have not included them in this PR.

Feature/Issue validation/testing:

Please describe the tests that you ran to verify your changes and relevant result summary. Provide instructions so it can be reproduced.
Please also list any relevant details for your test configuration.

unit and e2e tests

Special notes for your reviewer:

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 February 20, 2025 11:51
Signed-off-by: Jin Dong <greenmoon55@users.noreply.github.com>
(cherry picked from commit b836fc8)
* squash commits

Signed-off-by: Jin Dong <greenmoon55@users.noreply.github.com>

* localmodel agent -> localmodelnode agent

Signed-off-by: Jin Dong <greenmoon55@users.noreply.github.com>

* Revert change

Signed-off-by: Jin Dong <greenmoon55@users.noreply.github.com>

---------

Signed-off-by: Jin Dong <greenmoon55@users.noreply.github.com>
(cherry picked from commit cb38637)
* Fix model server fails to gracefully shutdown

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>

* Update unit tests

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>

---------

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
Co-authored-by: Dan Sun <dsun20@bloomberg.net>
(cherry picked from commit 41a1fd7)
kserve#4152)

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

Signed-off-by: Dan Sun <dsun20@bloomberg.net>
(cherry picked from commit 07edb56)
Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
(cherry picked from commit 61b0746)
* updated package versions

Signed-off-by: ayush <ayush.sawant@nutanix.com>

* updated go.mod and pip

Signed-off-by: ayush <ayush.sawant@nutanix.com>

* updated poetry lock

Signed-off-by: ayush <ayush.sawant@nutanix.com>

* refactored handling of task argument

Signed-off-by: ayush <ayush.sawant@nutanix.com>

* removed go.mod changes

Signed-off-by: ayush <ayush.sawant@nutanix.com>

---------

Signed-off-by: ayush <ayush.sawant@nutanix.com>
(cherry picked from commit 5e5bff8)
* Add workflow for verifying go mod

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>

* Merge with go lint workflow

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>

---------

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
Co-authored-by: Dan Sun <dsun20@bloomberg.net>
(cherry picked from commit 874a4a4)
upgrade aiohttp

Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>
Co-authored-by: Dan Sun <dsun20@bloomberg.net>
(cherry picked from commit ff13ef8)
* 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 <fspolti@redhat.com>

* review changes

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
(cherry picked from commit 7bec6fb)
Signed-off-by: Jin Dong <jdong183@bloomberg.net>
(cherry picked from commit 8f79c44)
* 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 <fspolti@redhat.com>

* update go.sum

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
(cherry picked from commit 5b718bc)
* Helm chart - option to run daemonset as root

Signed-off-by: Jin Dong <jdong183@bloomberg.net>

* make generate

Signed-off-by: Jin Dong <jdong183@bloomberg.net>

* Revert default values

Signed-off-by: Jin Dong <jdong183@bloomberg.net>

* Fix job count test

Signed-off-by: Dan Sun <dsun20@bloomberg.net>

---------

Signed-off-by: Jin Dong <jdong183@bloomberg.net>
Signed-off-by: Dan Sun <dsun20@bloomberg.net>
Co-authored-by: Dan Sun <dsun20@bloomberg.net>
(cherry picked from commit 3e842b8)
Replace nodeGroup with nodeGroups

Signed-off-by: Rituraj Singh <rsingh660@bloomberg.net>
Co-authored-by: Rituraj Singh <rsingh660@bloomberg.net>
(cherry picked from commit 7b2681f)
* Add affinity and tolerations to localmodel daemonset

Signed-off-by: Jin Dong <jdong183@bloomberg.net>

* make generate

Signed-off-by: Jin Dong <jdong183@bloomberg.net>

---------

Signed-off-by: Jin Dong <jdong183@bloomberg.net>
(cherry picked from commit 3597fa7)
…#4157)

* sets virtual addressing style for legacy s3 endpoint

Signed-off-by: bentohset <toh.benjamin123@gmail.com>

* add unit test

Signed-off-by: bentohset <toh.benjamin123@gmail.com>

* fix formatting

Signed-off-by: bentohset <toh.benjamin123@gmail.com>

* fix unit tests

Signed-off-by: bentohset <toh.benjamin123@gmail.com>

---------

Signed-off-by: bentohset <toh.benjamin123@gmail.com>
Co-authored-by: Lize Cai <lize.cai@sap.com>
(cherry picked from commit cb8a657)
* Make label and annotation propagation configurable

chore:	Make the DisallaowedAnnotations and Labels configurable through
	ConfigMap so users can configured it quickly.

fixes kserve#3710

Signed-off-by: Spolti <fspolti@redhat.com>

* generate boilerplate code

Signed-off-by: Spolti <fspolti@redhat.com>

* Edgar's review changes

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>

(cherry picked from commit 654d314)
Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
@spolti
Copy link
Member

spolti commented Feb 20, 2025

did you break this sync into smaller chunks?

Copy link
Member

@spolti spolti left a comment

Choose a reason for hiding this comment

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

@israel-hdez @Jooho do you want to take a look before merging?

Copy link

openshift-ci bot commented Feb 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spolti, VedantMahabaleshwarkar

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:
  • OWNERS [VedantMahabaleshwarkar,spolti]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@VedantMahabaleshwarkar
Copy link
Author

did you break this sync into smaller chunks?

@spolti Yes, I sent this on slack

for the sync from upstream, the gatewayapi changes are leading to some unit and e2e test failures that I was unable to get to in time, I have replaced the original PR with #506, which syncs commits up to (but not including) the gateway api commits. At least we can merge this during this sprint, and next sprint we can do a further sync to include the gatewayapi changes

@Jooho
Copy link

Jooho commented Feb 20, 2025

Vedant confirmed he did e2e test on this PR and passed all except raw. He will follow up the raw e2e test issue so I am ok to merge this PR.

Copy link

openshift-ci bot commented Feb 20, 2025

@VedantMahabaleshwarkar: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-path-based-routing 3c57909 link true /test e2e-path-based-routing
ci/prow/e2e-predictor 3c57909 link true /test e2e-predictor
ci/prow/e2e-graph 3c57909 link true /test e2e-graph

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: New/Backlog
Development

Successfully merging this pull request may close these issues.

10 participants