Mark LLMCredentials and TLSCACertBundle optional

This commit marks the LLMCredentials and TLSCACertBundle as optional.
Also it ensures that when patching the OLSConfig Optional values are
checked for nil. If an optional value is not set it won't be added into
the patched OLSConfig.

Author: lpiwowar

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -11681,11 +11681,9 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
-                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName
-                    - tlsCACertBundle
                     type: object
                 type: object
               ovn:

apis/bases/lightspeed.openstack.org_openstacklightspeeds.yaml

@@ -47,12 +47,10 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
-            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName
             - ragImage
-            - tlsCACertBundle
             type: object
           status:
             properties:

apis/lightspeed/v1beta1/openstacklightspeed_types.go

@@ -51,15 +51,15 @@ type OpenStackLightspeedCore struct {
 	LLMEndpointType *string `json:"llmEndpointType"`
 
 	// +kubebuilder:validation:Required
+	// Name of the model to use at the API endpoint provided in LLMEndpoint
+	ModelName *string `json:"modelName"`
+
+	// +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".
 	LLMCredentials *string `json:"llmCredentials"`
 
-	// +kubebuilder:validation:Required
-	// Name of the model to use at the API endpoint provided in LLMEndpoint
-	ModelName *string `json:"modelName"`
-
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// Configmap name containing a CA Certificates bundle
 	TLSCACertBundle *string `json:"tlsCACertBundle"`
 }

apis/lightspeed/v1beta1/zz_generated.deepcopy.go

@@ -11845,11 +11845,9 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
-                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName
-                    - tlsCACertBundle
                     type: object
                 type: object
               ovn:
@@ -20244,12 +20242,10 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
-            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName
             - ragImage
-            - tlsCACertBundle
             type: object
           status:
             properties:

bindata/crds/crds.yaml

@@ -11681,11 +11681,9 @@ spec:
                       tlsCACertBundle:
                         type: string
                     required:
-                    - llmCredentials
                     - llmEndpoint
                     - llmEndpointType
                     - modelName
-                    - tlsCACertBundle
                     type: object
                 type: object
               ovn:

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

@@ -47,12 +47,10 @@ spec:
               tlsCACertBundle:
                 type: string
             required:
-            - llmCredentials
             - llmEndpoint
             - llmEndpointType
             - modelName
             - ragImage
-            - tlsCACertBundle
             type: object
           status:
             properties:

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

@@ -117,23 +117,25 @@ func PatchOLSConfig(
 	indexID string,
 ) error {
 	// 1. Patch the Providers section
-	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{}{},
-				},
+	providersConfig := map[string]interface{}{
+		"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
 	}