From 90ecc97e76ba80b6cd00a980d377ab8b8c641bfd Mon Sep 17 00:00:00 2001
From: jooho <jlee@redhat.com>
Date: Wed, 27 Sep 2023 23:20:23 -0400
Subject: [PATCH] update a checking logic to find modelMesh enabled namespace

Signed-off-by: jooho <jlee@redhat.com>
---
 controllers/util.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/controllers/util.go b/controllers/util.go
index e2b0aea54..e0fdabc4f 100644
--- a/controllers/util.go
+++ b/controllers/util.go
@@ -18,6 +18,7 @@ import (
 	"context"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -42,7 +43,10 @@ func modelMeshEnabled2(ctx context.Context, namespace, controllerNamespace strin
 	}
 	n := &corev1.Namespace{}
 	if err := client.Get(ctx, types.NamespacedName{Name: namespace}, n); err != nil {
-		return false, err
+		if errors.IsNotFound(err) {
+			// If the namespace has already been deleted, it can not be modelmesh namespace
+			return false, nil
+		}
 	}
 	return modelMeshEnabled(n, controllerNamespace), nil
 }