From 479815e6c8085af0cc1f025de0e1750b95faaa9b Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 11 Sep 2024 10:30:16 -0400
Subject: [PATCH] [RHOAIENG-12726] - odh-model-controller crashes with empty
 isvc.model field (#264)

chore:	fix nil pointer if the custom isvc does not have the model field.

Signed-off-by: Spolti <fspolti@redhat.com>
---
 ...nferenceservice_controller_metrics_test.go | 23 ++++++++++++++++++-
 .../kserve_metrics_dashboard_reconciler.go    | 17 ++++++++++----
 .../kserve-nil-model-inference-service.yaml   | 10 ++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 controllers/testdata/deploy/kserve-nil-model-inference-service.yaml

diff --git a/controllers/kserve_inferenceservice_controller_metrics_test.go b/controllers/kserve_inferenceservice_controller_metrics_test.go
index 2f7c3c8e..c63ef12d 100644
--- a/controllers/kserve_inferenceservice_controller_metrics_test.go
+++ b/controllers/kserve_inferenceservice_controller_metrics_test.go
@@ -20,9 +20,11 @@ const (
 	KserveOvmsInferenceServiceName         = "example-onnx-mnist"
 	UnsupportedMetricsInferenceServiceName = "sklearn-v2-iris"
 	NilRuntimeInferenceServiceName         = "sklearn-v2-iris-no-runtime"
+	NilModelInferenceServiceName           = "custom-runtime"
 	UnsupportedMetricsInferenceServicePath = "./testdata/deploy/kserve-unsupported-metrics-inference-service.yaml"
 	UnsupprtedMetricsServingRuntimePath    = "./testdata/deploy/kserve-unsupported-metrics-serving-runtime.yaml"
 	NilRuntimeInferenceServicePath         = "./testdata/deploy/kserve-nil-runtime-inference-service.yaml"
+	NilModelInferenceServicePath           = "./testdata/deploy/kserve-nil-model-inference-service.yaml"
 )
 
 var _ = Describe("The KServe Dashboard reconciler", func() {
@@ -126,6 +128,25 @@ var _ = Describe("The KServe Dashboard reconciler", func() {
 			}
 			Expect(compareConfigMap(metricsConfigMap, expectedmetricsConfigMap)).Should(BeTrue())
 		})
+
+		It("if the isvc does not have the model field specified, an unsupported metrics configmap should be created", func() {
+			_ = createInferenceService(testNs, NilModelInferenceServiceName, NilModelInferenceServicePath)
+
+			metricsConfigMap, err := waitForConfigMap(cli, testNs, NilModelInferenceServiceName+constants.KserveMetricsConfigMapNameSuffix, 30, 1*time.Second)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(metricsConfigMap).NotTo(BeNil())
+
+			expectedCM := &corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      NilModelInferenceServiceName + constants.KserveMetricsConfigMapNameSuffix,
+					Namespace: testNs,
+				},
+				Data: map[string]string{
+					"supported": "false",
+				},
+			}
+			Expect(compareConfigMap(metricsConfigMap, expectedCM)).Should(BeTrue())
+		})
 	})
 
 	When("deleting the deployed models", func() {
@@ -147,7 +168,7 @@ var _ = Describe("The KServe Dashboard reconciler", func() {
 			Expect(cli.Delete(ctx, SklearnInferenceService)).Should(Succeed())
 			Eventually(func() error {
 				configmap := &corev1.ConfigMap{}
-				key := types.NamespacedName{Name: KserveOvmsInferenceServiceName + constants.KserveMetricsConfigMapNameSuffix, Namespace: SklearnInferenceService.Namespace}
+				key := types.NamespacedName{Name: UnsupportedMetricsInferenceServiceName + constants.KserveMetricsConfigMapNameSuffix, Namespace: SklearnInferenceService.Namespace}
 				err := cli.Get(ctx, key, configmap)
 				return err
 			}, timeout, interval).ShouldNot(Succeed())
diff --git a/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go b/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go
index 0eec5261..e07c243c 100644
--- a/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go
+++ b/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go
@@ -95,17 +95,24 @@ func (r *KserveMetricsDashboardReconciler) createDesiredResource(ctx context.Con
 	var servingRuntime string
 	runtime := &kservev1alpha1.ServingRuntime{}
 	supported := false
+
+	// there is the possibility to also have and nil model field, e.g:
+	//predictor:
+	//	containers:
+	//		- name: kserve-container
+	//		image: user/custom-model:v1
+	if nil == isvc.Spec.Predictor.Model {
+		log.V(1).Info("no `predictor.model` field found in InferenceService, no metrics will be available")
+		return r.createConfigMap(isvc, false, log)
+	}
+
 	// resolve SR
 	isvcRuntime := isvc.Spec.Predictor.Model.Runtime
 	if isvcRuntime == nil {
 		runtime, err = utils.FindSupportingRuntimeForISvc(ctx, r.client, log, isvc)
 		if err != nil {
 			if errwrap.Contains(err, constants.NoSuitableRuntimeError) {
-				configmap, err := r.createConfigMap(isvc, false, log)
-				if err != nil {
-					return nil, err
-				}
-				return configmap, nil
+				return r.createConfigMap(isvc, false, log)
 			}
 			return nil, err
 		}
diff --git a/controllers/testdata/deploy/kserve-nil-model-inference-service.yaml b/controllers/testdata/deploy/kserve-nil-model-inference-service.yaml
new file mode 100644
index 00000000..774dc91b
--- /dev/null
+++ b/controllers/testdata/deploy/kserve-nil-model-inference-service.yaml
@@ -0,0 +1,10 @@
+apiVersion: serving.kserve.io/v1beta1
+kind: InferenceService
+metadata:
+  name: custom-model
+  namespace: default
+spec:
+  predictor:
+    containers:
+      - name: kserve-container
+        image: user/custom-model:v1
\ No newline at end of file