Enable OKP by default

* OKP is now enabled by default.
* Drop the okp-configuration kuttl test and include OKP as part of the
  assertion of the other existing tests.

Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>

Author: umago

api/v1beta1/openstacklightspeed_types.go

@@ -54,7 +54,7 @@ const (
 // May change at any time without backward compatibility.
 //
 // Supported fields:
-//   - featureFlags: list of experimental feature flags to enable (e.g. ["okp"])
+//   - featureFlags: list of experimental feature flags to enable
 //   - okpChunkFilterQuery: Solr filter query for OKP searches (default: version-aware query combining detected OpenStack and OCP versions)
 //   - okpRagOnly: when true, only OKP is used as a RAG source (default: false)
 type DevSpec struct {

internal/controller/common.go

@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"strings"
 
 	common_helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
@@ -142,12 +141,6 @@ func parseDevConfig(instance *apiv1beta1.OpenStackLightspeed) (apiv1beta1.DevSpe
 	return config, nil
 }
 
-// isOKPEnabled returns true if the "okp" feature flag is present in the dev config.
-func isOKPEnabled(instance *apiv1beta1.OpenStackLightspeed) bool {
-	config, _ := parseDevConfig(instance)
-	return slices.Contains(config.FeatureFlags, "okp")
-}
-
 // getOKPChunkFilterQuery returns the chunk filter query from the dev config, or a version-aware default.
 func getOKPChunkFilterQuery(ctx context.Context, h *common_helper.Helper, instance *apiv1beta1.OpenStackLightspeed) string {
 	config, _ := parseDevConfig(instance)

internal/controller/errors.go

@@ -55,8 +55,6 @@ var (
 	// OKP Errors
 	ErrCreateOKPDeployment = errors.New("failed to create OKP deployment")
 	ErrCreateOKPService    = errors.New("failed to create OKP service")
-	ErrDeleteOKPDeployment = errors.New("failed to delete OKP deployment")
-	ErrDeleteOKPService    = errors.New("failed to delete OKP service")
 
 	// Postgres Errors
 	ErrCreatePostgresDeployment      = errors.New("failed to create Postgres deployment")

internal/controller/lcore_config.go

@@ -220,12 +220,8 @@ func buildOKPConfig(ctx context.Context, h *common_helper.Helper, instance *apiv
 // buildLCoreConfigYAML assembles the complete Lightspeed Core Service configuration and converts to YAML.
 // NOTE: MCP servers, quota handlers, and tools approval features are disabled for OpenStack Lightspeed.
 func buildLCoreConfigYAML(ctx context.Context, h *common_helper.Helper, instance *apiv1beta1.OpenStackLightspeed) (string, error) {
-	okpEnabled := isOKPEnabled(instance)
 
-	ragInline := []interface{}{}
-	if okpEnabled {
-		ragInline = append(ragInline, "okp")
-	}
+	ragInline := []interface{}{"okp"}
 	ragConfig := map[string]interface{}{
 		"inline": ragInline,
 	}
@@ -245,9 +241,7 @@ func buildLCoreConfigYAML(ctx context.Context, h *common_helper.Helper, instance
 		"rag":                  ragConfig,
 	}
 
-	if okpEnabled {
-		config["okp"] = buildOKPConfig(ctx, h, instance)
-	}
+	config["okp"] = buildOKPConfig(ctx, h, instance)
 
 	// Convert to YAML
 	yamlBytes, err := yaml.Marshal(config)

internal/controller/lcore_deployment.go

@@ -277,9 +277,7 @@ func buildInitContainers(
 				"--enable-ocp-rag", strconv.FormatBool(instance.Spec.EnableOCPRAG),
 				"--ocp-version", ocp_version,
 			}
-			if isOKPEnabled(instance) {
-				cmd = append(cmd, "--enable-okp")
-			}
+			cmd = append(cmd, "--enable-okp")
 			return cmd
 		}(),
 		SecurityContext: securityContext,
@@ -609,12 +607,10 @@ func buildLlamaStackEnvVars(h *common_helper.Helper, ctx context.Context, instan
 		Value: VectorDBVolumeMountPath,
 	})
 
-	if isOKPEnabled(instance) {
-		envVars = append(envVars, corev1.EnvVar{
-			Name:  "RH_SERVER_OKP",
-			Value: fmt.Sprintf("http://%s.%s.svc:%d", OKPServiceName, instance.GetNamespace(), OKPServicePort),
-		})
-	}
+	envVars = append(envVars, corev1.EnvVar{
+		Name:  "RH_SERVER_OKP",
+		Value: fmt.Sprintf("http://%s.%s.svc:%d", OKPServiceName, instance.GetNamespace(), OKPServicePort),
+	})
 
 	return envVars, nil
 }
@@ -643,12 +639,10 @@ func buildLightspeedStackEnvVars(instance *apiv1beta1.OpenStackLightspeed) []cor
 		},
 		buildPostgresPasswordEnvVar(),
 	}
-	if isOKPEnabled(instance) {
-		envVars = append(envVars, corev1.EnvVar{
-			Name:  "RH_SERVER_OKP",
-			Value: fmt.Sprintf("http://%s.%s.svc:%d", OKPServiceName, instance.GetNamespace(), OKPServicePort),
-		})
-	}
+	envVars = append(envVars, corev1.EnvVar{
+		Name:  "RH_SERVER_OKP",
+		Value: fmt.Sprintf("http://%s.%s.svc:%d", OKPServiceName, instance.GetNamespace(), OKPServicePort),
+	})
 	return envVars
 }
 

internal/controller/llama_stack_config.go

@@ -256,9 +256,7 @@ func buildLlamaStackVectorDB(_ *common_helper.Helper, _ *apiv1beta1.OpenStackLig
 
 func buildLlamaStackVectorIO(h *common_helper.Helper, instance *apiv1beta1.OpenStackLightspeed, chunkFilterQuery string) []interface{} {
 	providers := buildLlamaStackVectorDB(h, instance)
-	if isOKPEnabled(instance) {
-		providers = append(providers, buildOKPVectorIOProvider(chunkFilterQuery))
-	}
+	providers = append(providers, buildOKPVectorIOProvider(chunkFilterQuery))
 	return providers
 }
 
@@ -378,32 +376,28 @@ func buildLlamaStackModels(_ *common_helper.Helper, instance *apiv1beta1.OpenSta
 		}
 	}
 
-	if isOKPEnabled(instance) {
-		models = append(models, map[string]interface{}{
-			"model_id":          "solr_embedding",
-			"model_type":        "embedding",
-			"provider_id":       "sentence-transformers",
-			"provider_model_id": OKPEmbeddingModelMountPath,
-			"metadata": map[string]interface{}{
-				"embedding_dimension": 384,
-			},
-		})
-	}
+	models = append(models, map[string]interface{}{
+		"model_id":          "solr_embedding",
+		"model_type":        "embedding",
+		"provider_id":       "sentence-transformers",
+		"provider_model_id": OKPEmbeddingModelMountPath,
+		"metadata": map[string]interface{}{
+			"embedding_dimension": 384,
+		},
+	})
 
 	return models
 }
 
-func buildLlamaStackVectorStores(_ *common_helper.Helper, instance *apiv1beta1.OpenStackLightspeed) []interface{} {
-	stores := []interface{}{}
-	if isOKPEnabled(instance) {
-		stores = append(stores, map[string]interface{}{
+func buildLlamaStackVectorStores(_ *common_helper.Helper, _ *apiv1beta1.OpenStackLightspeed) []interface{} {
+	return []interface{}{
+		map[string]interface{}{
 			"vector_store_id":     "portal-rag",
 			"provider_id":         "okp_solr",
 			"embedding_dimension": 384,
 			"embedding_model":     "sentence-transformers/" + OKPEmbeddingModelMountPath,
-		})
+		},
 	}
-	return stores
 }
 
 func buildLlamaStackToolGroups(_ *common_helper.Helper, _ *apiv1beta1.OpenStackLightspeed) []interface{} {
@@ -426,11 +420,8 @@ func buildLlamaStackYAML(h *common_helper.Helper, ctx context.Context, instance
 		return "", fmt.Errorf("failed to build inference providers: %w", err)
 	}
 
-	okpChunkFilterQuery := ""
-	if isOKPEnabled(instance) {
-		config["external_providers_dir"] = ExternalProvidersDir
-		okpChunkFilterQuery = getOKPChunkFilterQuery(ctx, h, instance)
-	}
+	config["external_providers_dir"] = ExternalProvidersDir
+	okpChunkFilterQuery := getOKPChunkFilterQuery(ctx, h, instance)
 
 	// Build providers map - only include providers for enabled APIs
 	config["providers"] = map[string]interface{}{

internal/controller/llama_stack_config_test.go

@@ -135,10 +135,15 @@ var _ = Describe("Llama Stack config", func() {
 				instance := getOpenStackLightspeedProvidersInstance(provider)
 				modelsConfig := buildLlamaStackModels(nil, instance)
 
-				Expect(modelsConfig).To(HaveLen(1))
+				Expect(modelsConfig).To(HaveLen(2))
 
 				modelConfig := modelsConfig[0].(map[string]interface{})
 				checkModelCommonConfig(modelConfig, instance)
+
+				okpModel := modelsConfig[1].(map[string]interface{})
+				Expect(okpModel["model_id"]).To(Equal("solr_embedding"))
+				Expect(okpModel["model_type"]).To(Equal("embedding"))
+				Expect(okpModel["provider_id"]).To(Equal("sentence-transformers"))
 			},
 			Entry("for openai", OpenAIProviderName),
 			Entry("for gemini", GeminiProviderName),

internal/controller/okp_reconciler.go

@@ -24,49 +24,21 @@ import (
 	apiv1beta1 "github.com/openstack-k8s-operators/lightspeed-operator/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 // ReconcileOKPDeployment reconciles the OKP Deployment and Service.
-// When OKP is disabled, it cleans up existing resources.
 func ReconcileOKPDeployment(h *common_helper.Helper, ctx context.Context, instance *apiv1beta1.OpenStackLightspeed) error {
-	if !isOKPEnabled(instance) {
-		return cleanupOKPResources(h, ctx)
-	}
-
 	tasks := []ReconcileTask{
 		{Name: "OKPDeployment", Task: reconcileOKPDeployment},
 		{Name: "OKPService", Task: reconcileOKPService},
 	}
 	return ReconcileTasksFailFast(h, ctx, instance, tasks)
 }
 
-func cleanupOKPResources(h *common_helper.Helper, ctx context.Context) error {
-	logger := h.GetLogger()
-	ns := h.GetBeforeObject().GetNamespace()
-
-	deploy := &appsv1.Deployment{}
-	deploy.Name = OKPDeploymentName
-	deploy.Namespace = ns
-	if err := h.GetClient().Delete(ctx, deploy); err != nil && !errors.IsNotFound(err) {
-		return fmt.Errorf("%w: %v", ErrDeleteOKPDeployment, err)
-	}
-
-	svc := &corev1.Service{}
-	svc.Name = OKPServiceName
-	svc.Namespace = ns
-	if err := h.GetClient().Delete(ctx, svc); err != nil && !errors.IsNotFound(err) {
-		return fmt.Errorf("%w: %v", ErrDeleteOKPService, err)
-	}
-
-	logger.Info("OKP resources cleaned up")
-	return nil
-}
-
 func reconcileOKPDeployment(h *common_helper.Helper, ctx context.Context, instance *apiv1beta1.OpenStackLightspeed) error {
 	logger := h.GetLogger()
 

test/kuttl/common/expected-configs/lightspeed-stack-okp.yaml

@@ -72,8 +72,13 @@ llama_stack:
   url: http://localhost:8321
   use_as_library_client: false
 name: Lightspeed Core Service (LCS)
+okp:
+  chunk_filter_query: product:(*openstack* OR *openshift*)
+  offline: true
+  rhokp_url: ${env.RH_SERVER_OKP}
 rag:
   inline:
+  - okp
   - vs_UUID
 service:
   access_log: true