Cleanup LLMEndpointType

Author: lpiwowar

api/v1beta1/openstacklightspeed_types.go

@@ -155,7 +155,7 @@ type OpenStackLightspeedCore struct {
 	LLMEndpoint string `json:"llmEndpoint"`
 
 	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:Enum=azure_openai;bam;openai;watsonx;rhoai_vllm;rhelai_vllm;fake_provider;gemini
+	// +kubebuilder:validation:Enum=azure_openai;openai;watsonx;rhoai_vllm;rhelai_vllm;gemini
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Provider Type"
 	// Type of the provider serving the LLM
 	LLMEndpointType string `json:"llmEndpointType"`

bundle/manifests/lightspeed.openstack.org_openstacklightspeeds.yaml

@@ -103,12 +103,10 @@ spec:
                 description: Type of the provider serving the LLM
                 enum:
                 - azure_openai
-                - bam
                 - openai
                 - watsonx
                 - rhoai_vllm
                 - rhelai_vllm
-                - fake_provider
                 - gemini
                 type: string
               llmProjectID:

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

@@ -103,12 +103,10 @@ spec:
                 description: Type of the provider serving the LLM
                 enum:
                 - azure_openai
-                - bam
                 - openai
                 - watsonx
                 - rhoai_vllm
                 - rhelai_vllm
-                - fake_provider
                 - gemini
                 type: string
               llmProjectID:

internal/controller/llama_stack_config.go

@@ -174,7 +174,17 @@ func buildLlamaStackInferenceProviders(_ *common_helper.Helper, _ context.Contex
 			}
 			providerConfig["config"] = config
 
-		case "watsonx", "bam":
+		case "watsonx":
+			providerConfig["provider_type"] = "remote::watsonx"
+
+			config := map[string]interface{}{}
+			config["base_url"] = provider.URL
+			config["project_id"] = provider.WatsonProjectID
+			config["api_key"] = fmt.Sprintf("${env.%s_API_KEY:=}", envVarName)
+
+			providerConfig["config"] = config
+
+		case "bam":
 			// These providers are not supported by Llama Stack
 			// They are handled directly by lightspeed-stack (LCS), not Llama Stack
 			return nil, fmt.Errorf("provider type '%s' (provider '%s') is not currently supported by Llama Stack. Supported types: openai, gemini, azure_openai, rhoai_vllm, rhelai_vllm", provider.Type, provider.Name)