Generic Provider Config for LCore supported providers.

Author: sriroopar

api/v1alpha1/olsconfig_types.go

@@ -21,6 +21,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
 // OLSConfigSpec defines the desired state of OLSConfig
@@ -436,6 +437,11 @@ type ModelSpec struct {
 // ProviderSpec defines the desired state of LLM provider.
 // +kubebuilder:validation:XValidation:message="'deploymentName' must be specified for 'azure_openai' provider",rule="self.type != \"azure_openai\" || self.deploymentName != \"\""
 // +kubebuilder:validation:XValidation:message="'projectID' must be specified for 'watsonx' provider",rule="self.type != \"watsonx\" || self.projectID != \"\""
+// +kubebuilder:validation:XValidation:message="'providerType' and 'config' must be used together in generic mode",rule="!has(self.providerType) || has(self.config)"
+// +kubebuilder:validation:XValidation:message="'config' requires 'providerType' to be set",rule="!has(self.config) || has(self.providerType)"
+// +kubebuilder:validation:XValidation:message="Generic mode (providerType set) requires type='generic'",rule="!has(self.providerType) || self.type == \"generic\""
+// +kubebuilder:validation:XValidation:message="Generic mode cannot use legacy provider-specific fields",rule="self.type != \"generic\" || (!has(self.deploymentName) && !has(self.projectID))"
+// +kubebuilder:validation:XValidation:message="credentialKey must not be empty string",rule="!has(self.credentialKey) || self.credentialKey != \"\""
 type ProviderSpec struct {
 	// Provider name
 	// +kubebuilder:validation:Required
@@ -459,7 +465,7 @@ type ProviderSpec struct {
 	// Provider type
 	// +kubebuilder:validation:Required
 	// +required
-	// +kubebuilder:validation:Enum=azure_openai;bam;openai;watsonx;rhoai_vllm;rhelai_vllm;fake_provider
+	// +kubebuilder:validation:Enum=azure_openai;bam;openai;watsonx;rhoai_vllm;rhelai_vllm;fake_provider;generic
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Provider Type"
 	Type string `json:"type"`
 	// Azure OpenAI deployment name
@@ -475,6 +481,25 @@ type ProviderSpec struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="TLS Security Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
 	TLSSecurityProfile *configv1.TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
+	// Generic provider type for Llama Stack (e.g., "remote::openai", "inline::sentence-transformers")
+	// When set, this provider uses generic mode instead of legacy mode.
+	// Must follow pattern: (inline|remote)::<provider-name>
+	// +kubebuilder:validation:Pattern=`^(inline|remote)::[a-z0-9][a-z0-9_-]*$`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Provider Type (Generic Mode)"
+	ProviderType string `json:"providerType,omitempty"`
+	// Arbitrary configuration for the provider (generic mode only)
+	// This map is passed directly to Llama Stack provider configuration.
+	// Credentials are automatically injected as environment variable substitutions.
+	// Example: {"url": "https://...", "custom_field": "value"}
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Provider Config (Generic Mode)"
+	Config *runtime.RawExtension `json:"config,omitempty"`
+	// Secret key name for provider credentials (default: "apitoken")
+	// Specifies which key in credentialsSecretRef contains the API token.
+	// The operator creates an environment variable named {PROVIDER_NAME}_API_KEY.
+	// +kubebuilder:default:="apitoken"
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Credential Key Name"
+	CredentialKey string `json:"credentialKey,omitempty"`
 }
 
 // UserDataCollectionSpec defines how we collect user data.

api/v1alpha1/zz_generated.deepcopy.go

@@ -60,6 +60,21 @@ spec:
                         apiVersion:
                           description: API Version for Azure OpenAI provider
                           type: string
+                        config:
+                          description: |-
+                            Arbitrary configuration for the provider (generic mode only)
+                            This map is passed directly to Llama Stack provider configuration.
+                            Credentials are automatically injected as environment variable substitutions.
+                            Example: {"url": "https://...", "custom_field": "value"}
+                          type: object
+                          x-kubernetes-preserve-unknown-fields: true
+                        credentialKey:
+                          default: apitoken
+                          description: |-
+                            Secret key name for provider credentials (default: "apitoken")
+                            Specifies which key in credentialsSecretRef contains the API token.
+                            The operator creates an environment variable named {PROVIDER_NAME}_API_KEY.
+                          type: string
                         credentialsSecretRef:
                           description: The name of the secret object that stores API
                             provider credentials
@@ -114,6 +129,13 @@ spec:
                         projectID:
                           description: Watsonx Project ID
                           type: string
+                        providerType:
+                          description: |-
+                            Generic provider type for Llama Stack (e.g., "remote::openai", "inline::sentence-transformers")
+                            When set, this provider uses generic mode instead of legacy mode.
+                            Must follow pattern: (inline|remote)::<provider-name>
+                          pattern: ^(inline|remote)::[a-z0-9][a-z0-9_-]*$
+                          type: string
                         tlsSecurityProfile:
                           description: TLS Security Profile used by connection to
                             provider
@@ -321,6 +343,7 @@ spec:
                           - rhoai_vllm
                           - rhelai_vllm
                           - fake_provider
+                          - generic
                           type: string
                         url:
                           description: Provider API URL
@@ -340,6 +363,19 @@ spec:
                       - message: '''projectID'' must be specified for ''watsonx''
                           provider'
                         rule: self.type != "watsonx" || self.projectID != ""
+                      - message: '''providerType'' and ''config'' must be used together
+                          in generic mode'
+                        rule: '!has(self.providerType) || has(self.config)'
+                      - message: '''config'' requires ''providerType'' to be set'
+                        rule: '!has(self.config) || has(self.providerType)'
+                      - message: Generic mode (providerType set) requires type='generic'
+                        rule: '!has(self.providerType) || self.type == "generic"'
+                      - message: Generic mode cannot use legacy provider-specific
+                          fields
+                        rule: self.type != "generic" || (!has(self.deploymentName)
+                          && !has(self.projectID))
+                      - message: credentialKey must not be empty string
+                        rule: '!has(self.credentialKey) || self.credentialKey != ""'
                     type: array
                 required:
                 - providers