Skip to content

Add Solr hybrid RAG via RHOKP sidecar#1653

Open
blublinsky wants to merge 1 commit into
openshift:mainfrom
blublinsky:okp-support
Open

Add Solr hybrid RAG via RHOKP sidecar#1653
blublinsky wants to merge 1 commit into
openshift:mainfrom
blublinsky:okp-support

Conversation

@blublinsky
Copy link
Copy Markdown
Contributor

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

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up dependent library

Related Tickets & Documents

Checklist before requesting a review

  • I have performed a self-review of my code.
  • PR has passed all pre-merge test jobs.
  • If it is a core feature, I have added thorough tests.

Testing

  • Please provide detailed steps to perform tests related to this code change.
  • How were the fix/results from this change verified? Please provide relevant screenshots or results.

@openshift-ci openshift-ci Bot requested review from bparees and xrajesh May 21, 2026 18:13
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 21, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign joshuawilson for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details 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-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 21, 2026

@blublinsky: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@blublinsky
Copy link
Copy Markdown
Contributor Author

/retest

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant