Add Solr hybrid RAG via RHOKP sidecar#1653
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@blublinsky: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/retest |
Description
Summary
Enables Solr hybrid RAG for OpenShift Lightspeed by wiring the operator to deploy an RH Offline Knowledge Portal (RHOKP) sidecar and emit solr_hybrid in the OLS application config when spec.ols.solrHybrid is set on OLSConfig.
CR / API
New optional spec.ols.solrHybrid with solrDirectRag (direct RAG vs tool-only docs search).
Ignored when spec.ols.byokRAGOnly is true (same precedence as OCP FAISS RAG).
CRD, CSV descriptors, and bundle updated.
App server deployment
RHOKP sidecar (rhokp) on the app-server pod when Solr hybrid is enabled: HTTP 8080, MCP stays on 8081.
Startup script disables Apache Listen 0.0.0.0:8443 to avoid port conflict with OLS HTTPS.
Optional ACCESS_KEY from user-created secret rhokp-access-key (optional key ref).
Fixed RHOKP resources per product guidance: 2 CPU, 2 GiB RAM, 75 GiB ephemeral; writable root filesystem for Solr data.
Operator flag --rhokp-image (default from related_images.json: registry.redhat.io/offline-knowledge-portal/rhokp-rhel9:latest).
OLS config generation
Writes solr_hybrid with http://localhost:8080 and operator defaults for hybrid retrieval tuning.
Transitional: keeps OCP (and BYOK) FAISS entries in reference_content and sets byok_index: true on all indexes when Solr hybrid is on, so lightspeed-service readiness passes until Solr-only health is supported.
Local dev
make dev-setup applies config/dev/metrics-reader-token.yaml to stop metrics-reader token reconcile loops under make run.
Note: Branch may include prior upstream/main sync (.ai/spec, AGENTS.md PR workflow, bundle/catalog snapshots). Solr changes are the functional delta in this PR.
Type of change
Related Tickets & Documents
https://redhat.atlassian.net/browse/OLS-3130
Checklist before requesting a review
Testing