Merge pull request #8 from umago/remove-ragImage

Remove ragImage configuration from CR

Author: lpiwowar

README.md

@@ -135,9 +135,6 @@ metadata:
   name: openstack-lightspeed
   namespace: openstack
 spec:
-$(if [ -n "$RHOS_LS_IMAGE" ]; then
-  echo "  ragImage: $RHOS_LS_IMAGE"
-fi)
   llmEndpoint: $LLM_ENDPOINT
   llmEndpointType: openai
   llmCredentials: openstack-lightspeed-apitoken

api/v1beta1/openstacklightspeed_types.go

@@ -95,10 +95,6 @@ type DatabaseSpec struct {
 type OpenStackLightspeedSpec struct {
 	OpenStackLightspeedCore `json:",inline"`
 
-	// +kubebuilder:validation:Optional
-	// ContainerImage for the OpenStack Lightspeed RAG container (will be set to environmental default if empty)
-	RAGImage string `json:"ragImage"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// Enables automatic OCP documentation based on cluster version

bundle/manifests/lightspeed.openstack.org_openstacklightspeeds.yaml

@@ -178,10 +178,6 @@ spec:
                       When false, uses reference_url (online).
                     type: boolean
                 type: object
-              ragImage:
-                description: ContainerImage for the OpenStack Lightspeed RAG container
-                  (will be set to environmental default if empty)
-                type: string
               tlsCACertBundle:
                 description: Configmap name containing a CA Certificates bundle
                 type: string

bundle/manifests/openstack-lightspeed-operator.clusterserviceversion.yaml

@@ -25,7 +25,7 @@ metadata:
       ]
     capabilities: Basic Install
     categories: AI/Machine Learning
-    createdAt: "2026-06-22T19:14:00Z"
+    createdAt: "2026-07-03T16:05:52Z"
     description: AI-powered virtual assistant for Red Hat OpenStack Services on OpenShift
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"

config/crd/bases/lightspeed.openstack.org_openstacklightspeeds.yaml

@@ -178,10 +178,6 @@ spec:
                       When false, uses reference_url (online).
                     type: boolean
                 type: object
-              ragImage:
-                description: ContainerImage for the OpenStack Lightspeed RAG container
-                  (will be set to environmental default if empty)
-                type: string
               tlsCACertBundle:
                 description: Configmap name containing a CA Certificates bundle
                 type: string

internal/controller/lcore_deployment.go

@@ -269,7 +269,7 @@ func buildInitContainers(
 	var containers []corev1.Container
 	containers = append(containers, corev1.Container{
 		Name:  "vector-database-collect",
-		Image: instance.Spec.RAGImage,
+		Image: apiv1beta1.OpenStackLightspeedDefaultValues.RAGImageURL,
 		Command: func() []string {
 			cmd := []string{
 				"sh", VectorDBScriptsMountPath + "/" + VectorDBCollectScriptKey,

internal/controller/ocp_version.go

@@ -250,15 +250,15 @@ func BuildRAGConfigs(instance *apiv1beta1.OpenStackLightspeed, ocpVersion string
 	rags := []interface{}{
 		// OpenStack RAG
 		map[string]interface{}{
-			"image":     instance.Spec.RAGImage,
+			"image":     apiv1beta1.OpenStackLightspeedDefaultValues.RAGImageURL,
 			"indexPath": OpenStackLightspeedVectorDBPath,
 		},
 	}
 
 	// Add OCP RAG if enabled
 	if ocpVersion != "" {
 		rags = append(rags, map[string]interface{}{
-			"image":     instance.Spec.RAGImage,
+			"image":     apiv1beta1.OpenStackLightspeedDefaultValues.RAGImageURL,
 			"indexPath": GetOCPVectorDBPath(ocpVersion),
 			"indexID":   GetOCPIndexName(ocpVersion),
 		})

internal/controller/ocp_version_test.go

@@ -234,12 +234,10 @@ func TestResolveOCPVersion(t *testing.T) {
 }
 
 func TestBuildRAGConfigs(t *testing.T) {
+	apiv1beta1.OpenStackLightspeedDefaultValues.RAGImageURL = testRAGImage
+
 	t.Run("OCP RAG disabled (empty version)", func(t *testing.T) {
-		instance := &apiv1beta1.OpenStackLightspeed{
-			Spec: apiv1beta1.OpenStackLightspeedSpec{
-				RAGImage: testRAGImage,
-			},
-		}
+		instance := &apiv1beta1.OpenStackLightspeed{}
 
 		configs := BuildRAGConfigs(instance, "")
 
@@ -268,11 +266,7 @@ func TestBuildRAGConfigs(t *testing.T) {
 	})
 
 	t.Run("OCP RAG enabled", func(t *testing.T) {
-		instance := &apiv1beta1.OpenStackLightspeed{
-			Spec: apiv1beta1.OpenStackLightspeedSpec{
-				RAGImage: testRAGImage,
-			},
-		}
+		instance := &apiv1beta1.OpenStackLightspeed{}
 
 		configs := BuildRAGConfigs(instance, "4.16")
 
@@ -332,11 +326,7 @@ func TestBuildRAGConfigs(t *testing.T) {
 	})
 
 	t.Run("OCP RAG with latest version", func(t *testing.T) {
-		instance := &apiv1beta1.OpenStackLightspeed{
-			Spec: apiv1beta1.OpenStackLightspeedSpec{
-				RAGImage: testRAGImage,
-			},
-		}
+		instance := &apiv1beta1.OpenStackLightspeed{}
 
 		configs := BuildRAGConfigs(instance, "latest")
 

internal/controller/openstacklightspeed_controller.go

@@ -159,10 +159,6 @@ func (r *OpenStackLightspeedReconciler) Reconcile(ctx context.Context, req ctrl.
 		return ctrl.Result{}, nil
 	}
 
-	if instance.Spec.RAGImage == "" {
-		instance.Spec.RAGImage = apiv1beta1.OpenStackLightspeedDefaultValues.RAGImageURL
-	}
-
 	if instance.Spec.MaxTokensForResponse == 0 {
 		instance.Spec.MaxTokensForResponse = apiv1beta1.OpenStackLightspeedDefaultValues.MaxTokensForResponse
 	}