Mark llmCredentials as required

The llmCredentials parameter is required in OLSConfig and therefore
should remain as required in our CRD as well.

Also, do not pass the tlsCACertBundle value to OLSConfig when it is nil as it
is an optional parameter.

Author: lpiwowar

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -11681,6 +11681,7 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
+                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName

apis/bases/lightspeed.openstack.org_openstacklightspeeds.yaml

@@ -47,6 +47,7 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
+            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName

apis/lightspeed/v1beta1/openstacklightspeed_types.go

@@ -54,6 +54,7 @@ type OpenStackLightspeedCore struct {
 	// Name of the model to use at the API endpoint provided in LLMEndpoint
 	ModelName *string `json:"modelName"`
 
+	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Optional
 	// Secret name containing API token for the LLMEndpoint. The key for the field
 	// in the secret that holds the token should be "apitoken".

bindata/crds/crds.yaml

@@ -11845,6 +11845,7 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
+                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName
@@ -20242,6 +20243,7 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
+            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName

config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -11681,6 +11681,7 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
+                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName

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

@@ -47,6 +47,7 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
+            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName

pkg/lightspeed/funcs.go

@@ -117,25 +117,22 @@ func PatchOLSConfig(
 	indexID string,
 ) error {
 	// 1. Patch the Providers section
-	providersConfig := map[string]interface{}{
-		"models": []interface{}{
-			map[string]interface{}{
-				"name":       StringPtrValue(instance.Spec.ModelName),
-				"parameters": map[string]interface{}{},
+	providersPatch := []interface{}{
+		map[string]interface{}{
+			"credentialsSecretRef": map[string]interface{}{
+				"name": StringPtrValue(instance.Spec.LLMCredentials),
+			},
+			"models": []interface{}{
+				map[string]interface{}{
+					"name":       StringPtrValue(instance.Spec.ModelName),
+					"parameters": map[string]interface{}{},
+				},
 			},
+			"name": OpenStackLightspeedDefaultProvider,
+			"type": StringPtrValue(instance.Spec.LLMEndpointType),
+			"url":  StringPtrValue(instance.Spec.LLMEndpoint),
 		},
-		"name": OpenStackLightspeedDefaultProvider,
-		"type": StringPtrValue(instance.Spec.LLMEndpointType),
-		"url":  StringPtrValue(instance.Spec.LLMEndpoint),
-	}
-
-	if instance.Spec.LLMCredentials != nil {
-		providersConfig["credentialsSecretRef"] = map[string]interface{}{
-			"name": StringPtrValue(instance.Spec.LLMCredentials),
-		}
 	}
-
-	providersPatch := []interface{}{providersConfig}
 	if err := uns.SetNestedSlice(olsConfig.Object, providersPatch, "spec", "llm", "providers"); err != nil {
 		return err
 	}
@@ -153,14 +150,16 @@ func PatchOLSConfig(
 		return err
 	}
 
-	tlsCaCertBundle := StringPtrValue(instance.Spec.TLSCACertBundle)
-	err := uns.SetNestedField(olsConfig.Object, tlsCaCertBundle, "spec", "ols", "additionalCAConfigMapRef", "name")
-	if err != nil {
-		return err
+	if instance.Spec.TLSCACertBundle != nil {
+		tlsCaCertBundle := StringPtrValue(instance.Spec.TLSCACertBundle)
+		err := uns.SetNestedField(olsConfig.Object, tlsCaCertBundle, "spec", "ols", "additionalCAConfigMapRef", "name")
+		if err != nil {
+			return err
+		}
 	}
 
 	modelName := StringPtrValue(instance.Spec.ModelName)
-	err = uns.SetNestedField(olsConfig.Object, modelName, "spec", "ols", "defaultModel")
+	err := uns.SetNestedField(olsConfig.Object, modelName, "spec", "ols", "defaultModel")
 	if err != nil {
 		return err
 	}