Sync upstream 20260423 0828#1436
Merged
openshift-merge-bot[bot] merged 30 commits intoopendatahub-io:masterfrom Apr 23, 2026
Merged
Sync upstream 20260423 0828#1436openshift-merge-bot[bot] merged 30 commits intoopendatahub-io:masterfrom
openshift-merge-bot[bot] merged 30 commits intoopendatahub-io:masterfrom
Conversation
…mplate (kserve#5302) Signed-off-by: alokdangre <alokdangre@gmail.com>
Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
…be (kserve#5345) Signed-off-by: Rey Shazni <reyshazni@gmail.com>
…kserve#5381) Signed-off-by: Spolti <fspolti@redhat.com>
Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
Signed-off-by: Pablo Iranzo Gómez <Pablo.Iranzo@gmail.com>
…serve#5398) Signed-off-by: Bartosz Majsak <bartosz.majsak@gmail.com>
…ve#5393) Signed-off-by: Horvath Agoston <agoston@cloudera.com>
Signed-off-by: Bartosz Majsak <bartosz.majsak@gmail.com>
…5403) Signed-off-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Signed-off-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Signed-off-by: Spolti <fspolti@redhat.com>
Signed-off-by: Jooho Lee <jlee@redhat.com> This PR is not about code changes, but rather a new release. It has been tested locally, and further validations will be carried out as part of the 0.18.0 release process. As such, it will be merged manually.
Signed-off-by: Jooho Lee <jlee@redhat.com>
… fixes (kserve#5423) Signed-off-by: Jooho Lee <jlee@redhat.com> This is only for release process and it is still under validation. So no need to review.
…ve#5365) Signed-off-by: Neelabh Sinha <neelabhsinha010@gmail.com>
Signed-off-by: James Ostrander <jostrand@redhat.com>
Signed-off-by: Jooho Lee <jlee@redhat.com>
…kserve#5420) Signed-off-by: James Ostrander <jostrand@redhat.com>
…serve#5413) Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Signed-off-by: Jooho Lee <jlee@redhat.com>
…e#5411) Signed-off-by: David Whyte-Gray <40244437+dagrayvid@users.noreply.github.com>
Signed-off-by: maskarb <mskarbek@redhat.com>
…60423-0828 # Conflicts: # Dockerfile # OWNERS # go.sum # python/aiffairness/uv.lock # python/artexplainer/uv.lock # python/custom_model/uv.lock # python/custom_tokenizer/uv.lock # python/custom_transformer/uv.lock # python/test_resources/graph/error_404_isvc/uv.lock # python/test_resources/graph/success_200_isvc/uv.lock # test/e2e/llmisvc/fixtures.py # test/scripts/gh-actions/run-e2e-tests.sh
|
Important Review skippedToo many files! This PR contains 172 files, which is 22 over the limit of 150. ⚙️ Run configurationConfiguration used: Central YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (18)
📒 Files selected for processing (172)
You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Remove users flagged as untrusted by the OWNERS verification bot: Datta0, gavrissh, greenmoon55, sivanantha321, andyi2it, cjohannsen-cloudera, cmaddalozzo, lizzzcai — none are members or collaborators of the opendatahub-io org. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Git auto-merged both upstream and midstream securityContext entries into the same container dict (workload-pd-cpu template), causing a duplicate key lint error (ruff F601). Remove the midstream RUN_AS_NON_ROOT version in favor of the upstream UPSTREAM_K8S_NON_ROOT_SECURITY_CONTEXT constant. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Run go mod tidy (removes stale prometheus-operator hash) and make uv-lock (updates requires-python markers) to satisfy the precommit-check CI gate. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The upstream merge introduced hardcoded runAsUser values (1000 for vllm-cpu, 65532 for llm-d simulator) in test fixture security contexts. On OpenShift, these UIDs fall outside the namespace's restricted-v2 SCC range and the workload service accounts lack access to the custom openshift-ai-llminferenceservice-scc, causing all pod creations to fail. Make the security context constants conditional on RUN_AS_NON_ROOT: when true (OpenShift CI), omit runAsUser so the SCC assigns UIDs from the namespace range; when false (upstream K8s), keep explicit UIDs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
@pierDipi: The following test has Succeeded: OCI Artifact Browser URLInspecting Test Artifacts ManuallyTo inspect your test artifacts manually, follow these steps:
mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/opendatahub/odh-ci-artifacts:kserve-group-test-l8rlg |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: andresllh, pierDipi The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
Bot
merged commit 56fa4f8
into
opendatahub-io:master
65 checks passed
github-project-automation
Bot
moved this from New/Backlog
to Done
in ODH Model Serving Planning
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Automated sync of
kserve/kserve:masterintoopendatahub-io/kserve:master.AI Conflict Resolution Report
12 files had merge conflicts. All were resolved successfully.
1.
Dockerfile(line 22)-a -tags "${GOTAGS}", upstream had-tags "${GOTAGS}" -ain thego buildcommand.2.
OWNERS(lines 2–22)reviewers:key from the upstream side, which would have created a duplicate section.3.
go.sum(line 3553)posener/complete,prometheus-operator/prometheus-operator) that midstream didn't have.go.modchanges that auto-merged cleanly.4.
test/e2e/llmisvc/fixtures.py(4 conflict regions: lines ~79, ~155, ~386, ~421)"runAsNonRoot": RUN_AS_NON_ROOT(an env-var-driven boolean, defaulting tofalse). Upstream usedUPSTREAM_K8S_NON_ROOT_SECURITY_CONTEXT.copy()which sets{"runAsNonRoot": True, "runAsUser": 1000}.UPSTREAM_K8S_NON_ROOT_SECURITY_CONTEXTconstant (defined in the same file at line 47) already carries a comment: "Vanilla Kubernetes rejects runAsNonRoot-only containers when the image does not declare a USER. Keep the templates OpenShift-safe and use an explicit non-root UID only in upstream CI test overrides." — i.e., it was designed to be safe for both environments.UPSTREAM_K8S_NON_ROOT_SECURITY_CONTEXT.copy()for all 4 locations. The upstream constant is more complete (includesrunAsUser) and is already documented as OpenShift-safe.5.
test/scripts/gh-actions/run-e2e-tests.sh(lines 64–72)MARKER_ARGS,PYTEST_COMMON_ARGS,PYTEST_EXTRA_ARGS) for local-run flexibility. Upstream (PR ci: add --maxfail=10 to e2e pytest invocation kserve/kserve#5445) added--maxfail=10to the inline pytest commands.--maxfail=10into thePYTEST_COMMON_ARGSarray definition. Both improvements are preserved. Referenced midstream commit f5fa7df (PR ci: improve e2e test scripts for local runs and llmisvc builds #1356) to confirm the refactoring intent.6–12.
python/*/uv.lock(7 files)aiffairness,artexplainer,custom_model,custom_tokenizer,custom_transformer,test_resources/graph/error_404_isvc,test_resources/graph/success_200_isvcgit checkout --theirs) for all 7 lock files. These are auto-generated and will be regenerated on the nextuv lockrun; upstream's versions reflect the newer dependency state consistent with the mergedpyproject.tomlfiles.This sync was performed by an automated AI agent.