Addressing review comments

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>

Author: visheshtanksale

api/apps/v1alpha1/nemo_common_types.go

@@ -0,0 +1,34 @@
+/*
+Copyright 2025.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+type Mongodb struct {
+	Endpoint string `json:"endpoint"`
+}
+
+type ArgoWorkFlows struct {
+	Endpoint       string `json:"endpoint"`
+	ServiceAccount string `json:"serviceAccount"`
+}
+
+type Milvus struct {
+	Endpoint string `json:"endpoint"`
+}
+
+type DataStore struct {
+	Endpoint string `json:"endpoint"`
+}

api/apps/v1alpha1/nemo_evaluator_types.go

@@ -74,10 +74,10 @@ type NemoEvaluatorSpec struct {
 	GroupID      *int64 `json:"groupID,omitempty"`
 	RuntimeClass string `json:"runtimeClass,omitempty"`
 
-	Mongodb       Mongodb       `json:"mongodb"`
-	ArgoWorkFlows ArgoWorkFlows `json:"argoWorkFlows"`
-	Milvus        Milvus        `json:"milvus"`
-	DataStore     DataStore     `json:"dataStore"`
+	Mongodb       *Mongodb       `json:"mongodb,omitempty"`
+	ArgoWorkFlows *ArgoWorkFlows `json:"argoWorkFlows,omitempty"`
+	Milvus        *Milvus        `json:"milvus,omitempty"`
+	DataStore     *DataStore     `json:"dataStore,omitempty"`
 }
 
 // NemoEvaluatorStatus defines the observed state of NemoEvaluator
@@ -111,23 +111,6 @@ type NemoEvaluatorList struct {
 	Items           []NemoEvaluator `json:"items"`
 }
 
-type Mongodb struct {
-	Endpoint string `json:"endpoint"`
-}
-
-type ArgoWorkFlows struct {
-	Endpoint       string `json:"endpoint"`
-	ServiceAccount string `json:"serviceAccount"`
-}
-
-type Milvus struct {
-	Endpoint string `json:"endpoint"`
-}
-
-type DataStore struct {
-	Endpoint string `json:"endpoint"`
-}
-
 // GetStandardSelectorLabels returns the standard selector labels for the NemoEvaluator deployment
 func (n *NemoEvaluator) GetStandardSelectorLabels() map[string]string {
 	return map[string]string{
@@ -149,6 +132,7 @@ func (n *NemoEvaluator) GetStandardLabels() map[string]string {
 // GetStandardEnv returns the standard set of env variables for the NemoEvaluator container
 func (n *NemoEvaluator) GetStandardEnv() []corev1.EnvVar {
 	// add standard env required for NIM service
+
 	envVars := []corev1.EnvVar{
 		{
 			Name:  "NAMESPACE",
@@ -195,9 +179,6 @@ func (n *NemoEvaluator) GetStandardEnv() []corev1.EnvVar {
 			Name:  "DATA_STORE_HOST",
 			Value: n.Spec.DataStore.Endpoint,
 		},
-		{
-			Name: "INFERENCE_URL",
-		},
 		{
 			Name:  "DATABASE_USERNAME",
 			Value: "root",

api/apps/v1alpha1/zz_generated.deepcopy.go

@@ -206,7 +206,7 @@ func main() {
 		render.NewRenderer("/manifests"),
 		ctrl.Log.WithName("controllers").WithName("NemoEvaluator"),
 	).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "NemoDatastore")
+		setupLog.Error(err, "unable to create controller", "controller", "NemoEvaluator")
 		os.Exit(1)
 	}
 

cmd/main.go

@@ -2126,11 +2126,6 @@ spec:
               userID:
                 format: int64
                 type: integer
-            required:
-            - argoWorkFlows
-            - dataStore
-            - milvus
-            - mongodb
             type: object
           status:
             description: NemoEvaluatorStatus defines the observed state of NemoEvaluator

config/crd/bases/apps.nvidia.com_nemoevaluators.yaml

@@ -275,7 +275,10 @@ func (r *NemoEvaluatorReconciler) reconcileNemoEvaluator(ctx context.Context, Ne
 	// Generate annotation for the current operator-version and apply to all resources
 	// Get generic name for all resources
 	namespacedName := types.NamespacedName{Name: NemoEvaluator.GetName(), Namespace: NemoEvaluator.GetNamespace()}
-
+	err = validateNemoEvaluator(ctx, NemoEvaluator)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
 	renderer := r.GetRenderer()
 
 	// Sync serviceaccount
@@ -346,6 +349,22 @@ func (r *NemoEvaluatorReconciler) reconcileNemoEvaluator(ctx context.Context, Ne
 	return ctrl.Result{}, nil
 }
 
+func validateNemoEvaluator(ctx context.Context, NemoEvaluator *appsv1alpha1.NemoEvaluator) error {
+	if NemoEvaluator.Spec.Mongodb == nil {
+		return fmt.Errorf(" Required field 'Spec.Mongodb' cannot be empty")
+	}
+	if NemoEvaluator.Spec.ArgoWorkFlows == nil {
+		return fmt.Errorf(" Required field 'Spec.ArgoWorkFlows' cannot be empty")
+	}
+	if NemoEvaluator.Spec.Milvus == nil {
+		return fmt.Errorf(" Required field 'Spec.Milvus' cannot be empty")
+	}
+	if NemoEvaluator.Spec.DataStore == nil {
+		return fmt.Errorf(" Required field 'Spec.DataStore' cannot be empty")
+	}
+	return nil
+}
+
 func (r *NemoEvaluatorReconciler) renderAndSyncResource(ctx context.Context, NemoEvaluator client.Object, renderer *render.Renderer, obj client.Object, renderFunc func() (client.Object, error), conditionType string, reason string) error {
 	logger := log.FromContext(ctx)