Merge pull request #1032 from syedriko/syedriko-ols-1980

OLS-1980: Add autodiscovery for indexID value

Author: openshift-merge-bot[bot]

Makefile

@@ -35,7 +35,7 @@ IMAGE_TAG_BASE ?= quay.io/openshift-lightspeed/lightspeed-operator
 
 # BUNDLE_TAG defines the version of the bundle.
 # You can use it as an arg. (E.g make bundle BUNDLE_TAG=0.0.1)
-BUNDLE_TAG ?= 1.0.5
+BUNDLE_TAG ?= 1.0.6
 
 # set the base image for docker files
 # You can use it as an arg.  (E.g make bundle BASE_IMG=registry.redhat.io/ubi9/ubi-minimal)
@@ -433,4 +433,4 @@ catalog-push: ## Push a catalog image.
 .PHONY: konflux-release
 konflux-release: kustomize yq
 	mkdir -p release-konflux
-	$(KUSTOMIZE) build hack/release-konflux | $(YQ) -s '"release-konflux/" + .metadata.name'
+	$(KUSTOMIZE) build hack/release-konflux | $(YQ) -s '"release-konflux/" + .metadata.name'

api/v1alpha1/olsconfig_types.go

@@ -143,8 +143,8 @@ type RAGSpec struct {
 	// +kubebuilder:default:="/rag/vector_db"
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Index Path in the Image"
 	IndexPath string `json:"indexPath,omitempty"`
-	// The Index ID of the RAG database
-	// +kubebuilder:default:="vector_db_index"
+	// The Index ID of the RAG database. Only needed if there are multiple indices in the database.
+	// +kubebuilder:default:=""
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Index ID"
 	IndexID string `json:"indexID,omitempty"`
 	// The URL of the container image to use as a RAG source

bundle/manifests/lightspeed-operator.clusterserviceversion.yaml

@@ -38,7 +38,7 @@ metadata:
       ]
     capabilities: Basic Install
     console.openshift.io/operator-monitoring-default: "true"
-    createdAt: "2025-10-03T15:49:27Z"
+    createdAt: "2025-10-10T17:31:05Z"
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
@@ -99,7 +99,7 @@ spec:
           - description: List of models from the provider
             displayName: Models
             path: llm.providers[0].models
-          - description: Defines the model's context window size. Default is specific to provider/model.
+          - description: Defines the model's context window size, in tokens. The default is 128k tokens.
             displayName: Context Window Size
             path: llm.providers[0].models[0].contextWindowSize
           - description: Model name
@@ -339,7 +339,7 @@ spec:
           - description: The URL of the container image to use as a RAG source
             displayName: Image
             path: ols.rag[0].image
-          - description: The Index ID of the RAG database
+          - description: The Index ID of the RAG database. Only needed if there are multiple indices in the database.
             displayName: Index ID
             path: ols.rag[0].indexID
           - description: The path to the RAG database inside of the container image

bundle/manifests/ols.openshift.io_olsconfigs.yaml

@@ -1036,8 +1036,9 @@ spec:
                             RAG source
                           type: string
                         indexID:
-                          default: vector_db_index
-                          description: The Index ID of the RAG database
+                          default: ""
+                          description: The Index ID of the RAG database. Only needed
+                            if there are multiple indices in the database.
                           type: string
                         indexPath:
                           default: /rag/vector_db

config/crd/bases/ols.openshift.io_olsconfigs.yaml

@@ -1036,8 +1036,9 @@ spec:
                             RAG source
                           type: string
                         indexID:
-                          default: vector_db_index
-                          description: The Index ID of the RAG database
+                          default: ""
+                          description: The Index ID of the RAG database. Only needed
+                            if there are multiple indices in the database.
                           type: string
                         indexPath:
                           default: /rag/vector_db

config/manifests/bases/lightspeed-operator.clusterserviceversion.yaml

@@ -311,7 +311,8 @@ spec:
       - description: The URL of the container image to use as a RAG source
         displayName: Image
         path: ols.rag[0].image
-      - description: The Index ID of the RAG database
+      - description: The Index ID of the RAG database. Only needed if there are multiple
+          indices in the database.
         displayName: Index ID
         path: ols.rag[0].indexID
       - description: The path to the RAG database inside of the container image

docs/olsconfig-ols-openshift-io-v1alpha1.adoc

@@ -1755,7 +1755,7 @@ Required::
 
 | `indexID`
 | `string`
-| The Index ID of the RAG database
+| The Index ID of the RAG database. Only needed if there are multiple indices in the database.
 
 | `indexPath`
 | `string`

test/e2e/byok_test.go

@@ -7,6 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	olsv1alpha1 "github.com/openshift/lightspeed-operator/api/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var _ = Describe("BYOK", Ordered, Label("BYOK"), func() {
@@ -32,6 +33,16 @@ var _ = Describe("BYOK", Ordered, Label("BYOK"), func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	It("should check that the default index ID is empty", FlakeAttempts(5), func() {
+		olsConfig := &olsv1alpha1.OLSConfig{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: OLSCRName,
+			}}
+		err := env.Client.Get(olsConfig)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(olsConfig.Spec.OLSConfig.RAG[0].IndexID).To(BeEmpty())
+	})
+
 	It("should query the BYOK database", FlakeAttempts(5), func() {
 		By("Testing OLS service activation")
 		secret, err := TestOLSServiceActivation(env)