Merge pull request #245 from VedantMahabaleshwarkar/eng-10286

add sanity check on regex match results while determining runtime image
opendatahub-io · Jul 25, 2024 · 7a14b20 · 7a14b20
2 parents 21747c9 + 00e21c4
commit 7a14b20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/controllers/constants/constants.go b/controllers/constants/constants.go
@@ -60,6 +60,7 @@ const (
 	TgisImageName                    = "text-generation-inference"
 	VllmImageName                    = "vllm"
 	CaikitImageName                  = "caikit-nlp"
+	ServingRuntimeFallBackImageName  = "unsupported"
 )
 
 // openshift

diff --git a/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go b/controllers/reconcilers/kserve_metrics_dashboard_reconciler.go
@@ -94,6 +94,7 @@ func (r *KserveMetricsDashboardReconciler) Reconcile(ctx context.Context, log lo
 func (r *KserveMetricsDashboardReconciler) createDesiredResource(ctx context.Context, log logr.Logger, isvc *kservev1beta1.InferenceService) (*corev1.ConfigMap, error) {
 
 	var err error
+	var servingRuntime string
 	runtime := &kservev1alpha1.ServingRuntime{}
 	supported := false
 	// resolve SR
@@ -125,7 +126,12 @@ func (r *KserveMetricsDashboardReconciler) createDesiredResource(ctx context.Con
 	servingRuntimeImage := runtime.Spec.Containers[0].Image
 	re := regexp.MustCompile(`/([^/@]+)[@:]`)
 	findImageName := re.FindStringSubmatch(servingRuntimeImage)
-	servingRuntime := findImageName[1]
+	// sanity check for regex match, will fall back to a known string that will lead to a configmap for unsupported metrics
+	if len(findImageName) < 2 {
+		servingRuntime = constants.ServingRuntimeFallBackImageName
+	} else {
+		servingRuntime = findImageName[1]
+	}
 
 	runtimeMetricsData := map[string]string{
 		constants.OvmsImageName:   constants.OvmsMetricsData,

diff --git a/controllers/testdata/deploy/kserve-unsupported-metrics-serving-runtime.yaml b/controllers/testdata/deploy/kserve-unsupported-metrics-serving-runtime.yaml
@@ -12,7 +12,7 @@ spec:
         - '--model_name={{.Name}}'
         - '--model_dir=/mnt/models'
         - '--http_port=8080'
-      image: 'kserve/unsupportedimage:v0.12.1'
+      image: 'kserve/dummy-sklearn-server' #This image does not exist. 
       name: kserve-container
       resources:
         limits: