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

Upstream master sync #83

Merged

Conversation

israel-hdez
Copy link

@israel-hdez israel-hdez commented Sep 12, 2023

What this PR does / why we need it:

Conflict resolution for #80

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 #80
Fixes #82

Testing

As this is synchronization, assume that this has already been tested in upstream.
Sanity check via the caikit demo should be enough. Some (untested) instructions would be:

jvujjini and others added 6 commits August 30, 2023 01:20
* List Models v2 REST API

Signed-off-by: Jagan Vujjini <jvujjini@Snehas-MacBook-Pro.local>
Signed-off-by: jvujjini <jagan120@gmail.com>

* Fixed lint error

Signed-off-by: jvujjini <jagan120@gmail.com>

---------

Signed-off-by: Jagan Vujjini <jvujjini@Snehas-MacBook-Pro.local>
Signed-off-by: jvujjini <jagan120@gmail.com>
Co-authored-by: Jagan Vujjini <jvujjini@Snehas-MacBook-Pro.local>
* Introduce priority field

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

* Implement validator webhook

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

* Add v2 support and priority to servingruntime yaml

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

* Fix protocol version in serving runtime sorting and reverse sort the serving runtime

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

* Add v2 protocol support in servingruntime charts

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

* Add webhooks to helm chart

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

* Add tests

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

* make generate

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

* fix supported modelformat sort

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

* fix helm chart

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

* rebase master

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

* Make model name comparision case insensitive

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

* Resolve comments

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

---------

Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
…provided uri is not a folder (kserve#3088)

* fix issue kserve#2473

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* add test

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* flake8

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* update target_key logic and add test

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* update

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* Implemented to download exact s3 object.

Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* Fixed s3 storage test.

Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

* Refactor code to make it more readable and reduce cognitive complexity

Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>

---------

Signed-off-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
Signed-off-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>
Co-authored-by: tjandy98 <3953059+tjandy98@users.noreply.github.com>
* First commit

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Removing unused code

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Added handling for ensemble use case

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Bumping up resources for ISVCs to come up quickly

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Using latest version of controller-gen

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding in testing resources

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Reverting res req and limits

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Enabling live logging for pytest to enable logs to prin to cli for easier debugging

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding images build step in e2e tests.

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Fixing test to use service_name

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding build of router image to use latest router image everytime for tests

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding router enrty for kserve deps setup to update router for IGs

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Fixed linting errors

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Asserting in pythonic way

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Updating kserve version to 0.11.0

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding more e2e tests

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Some refactoring to run tests locally easily

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Adding some test deps and adding more tests

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Fixing a bug and Adding tests for switch use cases

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Fixing a bug in e2e-test script

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Added e2e test cases for ensemble.

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Reducing parallelism to avoid pressure on minikube and timeouts

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Bump up timeout interval for the action.

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Bump up timeout interval for the test_triton_runtime_with_transformer as this ISVC has both predictor and transformer that needs to come up and it fails sometime with ISVC Timeout error.

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Running path-based routing tests as their own job

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Moved path-based-routing test as it's own job

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Reducing parallelism to 2

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Reducing parallelism to 2 for test-fast job and increasing timeout for job as well as new tests have been added

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

* Update test/e2e/graph/test-resources/ig_test_ensemble_scenario_7.yaml

Co-authored-by: Dan Sun <dsun20@bloomberg.net>
Signed-off-by: Rachit Chauhan <rachitchauhan43@gmail.com

* Removing parallelism and bumping up timeout to 120 mins to avoid resource contention issues.

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>

---------

Signed-off-by: rachitchauhan43 <rachitchauhan43@gmail.com>
Signed-off-by: Rachit Chauhan <rachitchauhan43@gmail.com>
Co-authored-by: Dan Sun <dsun20@bloomberg.net>
Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
@israel-hdez
Copy link
Author

/test e2e-slow

Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
Copy link

@Jooho Jooho left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Sep 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: israel-hdez, Jooho

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-robot openshift-merge-robot merged commit b6eac44 into opendatahub-io:master Sep 20, 2023
27 checks passed
@israel-hdez israel-hdez deleted the upstream-master-sync branch September 20, 2023 16:55
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.

Sync kserve/kserve/main with odh/kserve/main
7 participants