Update odh-model-controller to kserve v0.11.0

Signed-off-by: Vaibhav Jain <[email protected]>

Containerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi8/go-toolset:1.17 as builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

controllers/inferecenceservice_serviceaccount.go

@@ -23,7 +23,7 @@ import (
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/util/retry"
@@ -34,7 +34,7 @@ const (
 	modelMeshServiceAccountName = "modelmesh-serving-sa"
 )
 
-func newInferenceServiceSA(inferenceservice *inferenceservicev1.InferenceService) *corev1.ServiceAccount {
+func newInferenceServiceSA(inferenceservice *kservev1beta1.InferenceService) *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      modelMeshServiceAccountName,
@@ -63,7 +63,7 @@ func createDelegateClusterRoleBinding(serviceAccountName string, serviceAccountN
 	}
 }
 
-func (r *OpenshiftInferenceServiceReconciler) reconcileSA(inferenceService *inferenceservicev1.InferenceService, ctx context.Context, newSA func(service *inferenceservicev1.InferenceService) *corev1.ServiceAccount) error {
+func (r *OpenshiftInferenceServiceReconciler) reconcileSA(inferenceService *kservev1beta1.InferenceService, ctx context.Context, newSA func(service *kservev1beta1.InferenceService) *corev1.ServiceAccount) error {
 
 	// Initialize logger format
 	log := r.Log.WithValues("inferenceservice", inferenceService.Name, "namespace", inferenceService.Namespace)
@@ -159,7 +159,7 @@ func (r *OpenshiftInferenceServiceReconciler) reconcileSA(inferenceService *infe
 
 // ReconcileSA will manage the creation, update and deletion of the auth delegation SA + RBAC
 func (r *OpenshiftInferenceServiceReconciler) ReconcileSA(
-	inferenceservice *inferenceservicev1.InferenceService, ctx context.Context) error {
+	inferenceservice *kservev1beta1.InferenceService, ctx context.Context) error {
 	return r.reconcileSA(inferenceservice, ctx, newInferenceServiceSA)
 }
 

controllers/inferenceservice_controller.go

@@ -19,9 +19,8 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
-	predictorv1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
-	kservev1beta1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	routev1 "github.com/openshift/api/route/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -50,7 +49,7 @@ const (
 	inferenceServiceDeploymentModeAnnotationValue = "ModelMesh"
 )
 
-func (r *OpenshiftInferenceServiceReconciler) isDeploymentModeForIsvcModelMesh(inferenceservice *inferenceservicev1.InferenceService) bool {
+func (r *OpenshiftInferenceServiceReconciler) isDeploymentModeForIsvcModelMesh(inferenceservice *kservev1beta1.InferenceService) bool {
 	value, exists := inferenceservice.Annotations[inferenceServiceDeploymentModeAnnotation]
 	if exists && value == inferenceServiceDeploymentModeAnnotationValue {
 		return true
@@ -107,7 +106,7 @@ func (r *OpenshiftInferenceServiceReconciler) Reconcile(ctx context.Context, req
 func (r *OpenshiftInferenceServiceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	builder := ctrl.NewControllerManagedBy(mgr).
 		For(&kservev1beta1.InferenceService{}).
-		Owns(&predictorv1.ServingRuntime{}).
+		Owns(&kservev1alpha1.ServingRuntime{}).
 		Owns(&corev1.Namespace{}).
 		Owns(&routev1.Route{}).
 		Owns(&corev1.ServiceAccount{}).
@@ -117,10 +116,10 @@ func (r *OpenshiftInferenceServiceReconciler) SetupWithManager(mgr ctrl.Manager)
 		Owns(&networkingv1.NetworkPolicy{}).
 		Owns(&monitoringv1.ServiceMonitor{}).
 		Owns(&monitoringv1.PodMonitor{}).
-		Watches(&source.Kind{Type: &predictorv1.ServingRuntime{}},
+		Watches(&source.Kind{Type: &kservev1alpha1.ServingRuntime{}},
 			handler.EnqueueRequestsFromMapFunc(func(o client.Object) []reconcile.Request {
 				r.Log.Info("Reconcile event triggered by serving runtime: " + o.GetName())
-				inferenceServicesList := &inferenceservicev1.InferenceServiceList{}
+				inferenceServicesList := &kservev1beta1.InferenceServiceList{}
 				opts := []client.ListOption{client.InNamespace(o.GetNamespace())}
 
 				// Todo: Get only Inference Services that are deploying on the specific serving runtime

controllers/inferenceservice_controller_test.go

@@ -17,8 +17,8 @@ package controllers
 
 import (
 	"context"
-	mmv1alpha1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	routev1 "github.com/openshift/api/route/v1"
 	"k8s.io/apimachinery/pkg/types"
 
@@ -38,19 +38,19 @@ var _ = Describe("The Openshift model controller", func() {
 			opts = mf.UseClient(client)
 			ctx := context.Background()
 
-			servingRuntime1 := &mmv1alpha1.ServingRuntime{}
+			servingRuntime1 := &kservev1alpha1.ServingRuntime{}
 			err := convertToStructuredResource(ServingRuntimePath1, servingRuntime1, opts)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(cli.Create(ctx, servingRuntime1)).Should(Succeed())
 
-			servingRuntime2 := &mmv1alpha1.ServingRuntime{}
+			servingRuntime2 := &kservev1alpha1.ServingRuntime{}
 			err = convertToStructuredResource(ServingRuntimePath2, servingRuntime2, opts)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(cli.Create(ctx, servingRuntime2)).Should(Succeed())
 		})
 
 		It("when InferenceService specifies a runtime, should create a Route to expose the traffic externally", func() {
-			inferenceService := &inferenceservicev1.InferenceService{}
+			inferenceService := &kservev1beta1.InferenceService{}
 			err := convertToStructuredResource(InferenceService1, inferenceService, opts)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(cli.Create(ctx, inferenceService)).Should(Succeed())
@@ -71,7 +71,7 @@ var _ = Describe("The Openshift model controller", func() {
 		})
 
 		It("when InferenceService does not specifies a runtime, should automatically pick a runtime and create a Route", func() {
-			inferenceService := &inferenceservicev1.InferenceService{}
+			inferenceService := &kservev1beta1.InferenceService{}
 			err := convertToStructuredResource(InferenceServiceNoRuntime, inferenceService, opts)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(cli.Create(ctx, inferenceService)).Should(Succeed())

controllers/inferenceservice_meshmember.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"reflect"
 
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -29,7 +29,7 @@ import (
 )
 
 // NewInferenceServiceMeshMember defines the desired MeshMember object
-func NewInferenceServiceMeshMember(inferenceservice *inferenceservicev1.InferenceService) *maistrav1.ServiceMeshMember {
+func NewInferenceServiceMeshMember(inferenceservice *kservev1beta1.InferenceService) *maistrav1.ServiceMeshMember {
 	return &maistrav1.ServiceMeshMember{
 		TypeMeta: metav1.TypeMeta{},
 		// The name MUST be default, per the maistra docs
@@ -51,8 +51,8 @@ func CompareInferenceServiceMeshMembers(mm1 *maistrav1.ServiceMeshMember, mm2 *m
 
 // Reconcile will manage the creation, update and deletion of the MeshMember returned
 // by the newMeshMember function
-func (r *OpenshiftInferenceServiceReconciler) reconcileMeshMember(inferenceservice *inferenceservicev1.InferenceService,
-	ctx context.Context, newMeshMember func(*inferenceservicev1.InferenceService) *maistrav1.ServiceMeshMember) error {
+func (r *OpenshiftInferenceServiceReconciler) reconcileMeshMember(inferenceservice *kservev1beta1.InferenceService,
+	ctx context.Context, newMeshMember func(*kservev1beta1.InferenceService) *maistrav1.ServiceMeshMember) error {
 	// Initialize logger format
 	log := r.Log.WithValues("InferenceService", inferenceservice.Name, "namespace", inferenceservice.Namespace)
 
@@ -119,6 +119,6 @@ func (r *OpenshiftInferenceServiceReconciler) reconcileMeshMember(inferenceservi
 // ReconcileMeshMember will manage the creation, update and deletion of the
 // MeshMember when the Predictor is reconciled
 func (r *OpenshiftInferenceServiceReconciler) ReconcileMeshMember(
-	inferenceservice *inferenceservicev1.InferenceService, ctx context.Context) error {
+	inferenceservice *kservev1beta1.InferenceService, ctx context.Context) error {
 	return r.reconcileMeshMember(inferenceservice, ctx, NewInferenceServiceMeshMember)
 }

controllers/inferenceservice_route.go

@@ -21,8 +21,8 @@ import (
 	"sort"
 
 	"github.com/go-logr/logr"
-	predictorv1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	routev1 "github.com/openshift/api/route/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -41,7 +41,7 @@ const (
 )
 
 // NewInferenceServiceRoute defines the desired route object
-func NewInferenceServiceRoute(inferenceservice *inferenceservicev1.InferenceService, enableAuth bool) *routev1.Route {
+func NewInferenceServiceRoute(inferenceservice *kservev1beta1.InferenceService, enableAuth bool) *routev1.Route {
 
 	finalRoute := &routev1.Route{
 		ObjectMeta: metav1.ObjectMeta{
@@ -96,8 +96,8 @@ func CompareInferenceServiceRoutes(r1 routev1.Route, r2 routev1.Route) bool {
 		reflect.DeepEqual(r1.Spec, r2.Spec)
 }
 
-func (r *OpenshiftInferenceServiceReconciler) findSupportingRuntimeForISvc(ctx context.Context, log logr.Logger, inferenceservice *inferenceservicev1.InferenceService) *predictorv1.ServingRuntime {
-	desiredServingRuntime := predictorv1.ServingRuntime{}
+func (r *OpenshiftInferenceServiceReconciler) findSupportingRuntimeForISvc(ctx context.Context, log logr.Logger, inferenceservice *kservev1beta1.InferenceService) *kservev1alpha1.ServingRuntime {
+	desiredServingRuntime := kservev1alpha1.ServingRuntime{}
 
 	if inferenceservice.Spec.Predictor.Model.Runtime != nil {
 		err := r.Get(ctx, types.NamespacedName{
@@ -111,7 +111,7 @@ func (r *OpenshiftInferenceServiceReconciler) findSupportingRuntimeForISvc(ctx c
 		}
 		return &desiredServingRuntime
 	} else {
-		runtimes := &predictorv1.ServingRuntimeList{}
+		runtimes := &kservev1alpha1.ServingRuntimeList{}
 		err := r.List(ctx, runtimes, client.InNamespace(inferenceservice.Namespace))
 		if err != nil {
 			log.Error(err, "Listing ServingRuntimes failed")
@@ -156,8 +156,8 @@ func (r *OpenshiftInferenceServiceReconciler) findSupportingRuntimeForISvc(ctx c
 
 // Reconcile will manage the creation, update and deletion of the route returned
 // by the newRoute function
-func (r *OpenshiftInferenceServiceReconciler) reconcileRoute(inferenceservice *inferenceservicev1.InferenceService,
-	ctx context.Context, newRoute func(service *inferenceservicev1.InferenceService, enableAuth bool) *routev1.Route) error {
+func (r *OpenshiftInferenceServiceReconciler) reconcileRoute(inferenceservice *kservev1beta1.InferenceService,
+	ctx context.Context, newRoute func(service *kservev1beta1.InferenceService, enableAuth bool) *routev1.Route) error {
 	// Initialize logger format
 	log := r.Log.WithValues("inferenceservice", inferenceservice.Name, "namespace", inferenceservice.Namespace)
 
@@ -243,6 +243,6 @@ func (r *OpenshiftInferenceServiceReconciler) reconcileRoute(inferenceservice *i
 // ReconcileRoute will manage the creation, update and deletion of the
 // TLS route when the predictor is reconciled
 func (r *OpenshiftInferenceServiceReconciler) ReconcileRoute(
-	inferenceservice *inferenceservicev1.InferenceService, ctx context.Context) error {
+	inferenceservice *kservev1beta1.InferenceService, ctx context.Context) error {
 	return r.reconcileRoute(inferenceservice, ctx, NewInferenceServiceRoute)
 }

controllers/inferenceservice_virtualservice.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"reflect"
 
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	"istio.io/api/meta/v1alpha1"
 	"istio.io/api/networking/v1alpha3"
 	virtualservicev1 "istio.io/client-go/pkg/apis/networking/v1alpha3"
@@ -31,7 +31,7 @@ import (
 )
 
 // NewInferenceServiceVirtualService defines the desired VirtualService object
-func NewInferenceServiceVirtualService(inferenceservice *inferenceservicev1.InferenceService) *virtualservicev1.VirtualService {
+func NewInferenceServiceVirtualService(inferenceservice *kservev1beta1.InferenceService) *virtualservicev1.VirtualService {
 	return &virtualservicev1.VirtualService{
 		TypeMeta:   metav1.TypeMeta{},
 		ObjectMeta: metav1.ObjectMeta{Name: inferenceservice.Name, Namespace: inferenceservice.Namespace, Labels: map[string]string{"inferenceservice-name": inferenceservice.Name}},
@@ -72,8 +72,8 @@ func CompareInferenceServiceVirtualServices(vs1 *virtualservicev1.VirtualService
 
 // Reconcile will manage the creation, update and deletion of the VirtualService returned
 // by the newVirtualService function
-func (r *OpenshiftInferenceServiceReconciler) reconcileVirtualService(inferenceservice *inferenceservicev1.InferenceService,
-	ctx context.Context, newVirtualService func(service *inferenceservicev1.InferenceService) *virtualservicev1.VirtualService) error {
+func (r *OpenshiftInferenceServiceReconciler) reconcileVirtualService(inferenceservice *kservev1beta1.InferenceService,
+	ctx context.Context, newVirtualService func(service *kservev1beta1.InferenceService) *virtualservicev1.VirtualService) error {
 	// Initialize logger format
 	log := r.Log.WithValues("inferenceservice", inferenceservice.Name, "namespace", inferenceservice.Namespace)
 
@@ -140,6 +140,6 @@ func (r *OpenshiftInferenceServiceReconciler) reconcileVirtualService(inferences
 // ReconcileVirtualService will manage the creation, update and deletion of the
 // VirtualService when the Predictor is reconciled
 func (r *OpenshiftInferenceServiceReconciler) ReconcileVirtualService(
-	inferenceservice *inferenceservicev1.InferenceService, ctx context.Context) error {
+	inferenceservice *kservev1beta1.InferenceService, ctx context.Context) error {
 	return r.reconcileVirtualService(inferenceservice, ctx, NewInferenceServiceVirtualService)
 }

controllers/kserve_inferenceservice_controller.go

@@ -18,7 +18,7 @@ package controllers
 import (
 	"context"
 
-	kservev1beta1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"istio.io/api/security/v1beta1"
 	"istio.io/api/telemetry/v1alpha1"

controllers/monitoring_controller.go

@@ -18,7 +18,7 @@ package controllers
 import (
 	"context"
 	"github.com/go-logr/logr"
-	mmv1alpha1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	k8srbacv1 "k8s.io/api/rbac/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
@@ -176,7 +176,7 @@ func (r *MonitoringReconciler) reconcileRoleBinding(ctx context.Context, req ctr
 	}
 
 	// Get ServingRuntimes
-	servingRuntimes := &mmv1alpha1.ServingRuntimeList{}
+	servingRuntimes := &kservev1alpha1.ServingRuntimeList{}
 	listOptions := client.ListOptions{
 		Namespace: req.Namespace,
 	}
@@ -253,7 +253,7 @@ func (r *MonitoringReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 // SetupWithManager sets up the controller with the Manager.
 func (r *MonitoringReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	builder := ctrl.NewControllerManagedBy(mgr).
-		For(&mmv1alpha1.ServingRuntime{}).
+		For(&kservev1alpha1.ServingRuntime{}).
 		// Watch for changes to ModelMesh Enabled namespaces & a select few others
 		Watches(&source.Kind{Type: &corev1.Namespace{}},
 			handler.EnqueueRequestsFromMapFunc(func(o client.Object) []reconcile.Request {

controllers/monitoring_controller_test.go

@@ -18,7 +18,7 @@ package controllers
 import (
 	"context"
 	"errors"
-	mmv1alpha1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
 	mfc "github.com/manifestival/controller-runtime-client"
 	mf "github.com/manifestival/manifestival"
 	. "github.com/onsi/ginkgo"
@@ -30,14 +30,14 @@ import (
 )
 
 func deployServingRuntime(path string, opts mf.Option, ctx context.Context) {
-	servingRuntime := &mmv1alpha1.ServingRuntime{}
+	servingRuntime := &kservev1alpha1.ServingRuntime{}
 	err := convertToStructuredResource(path, servingRuntime, opts)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cli.Create(ctx, servingRuntime)).Should(Succeed())
 }
 
 func deleteServingRuntime(path string, opts mf.Option, ctx context.Context) {
-	servingRuntime := &mmv1alpha1.ServingRuntime{}
+	servingRuntime := &kservev1alpha1.ServingRuntime{}
 	err := convertToStructuredResource(path, servingRuntime, opts)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cli.Delete(ctx, servingRuntime)).Should(Succeed())

controllers/suite_test.go

@@ -21,17 +21,15 @@ import (
 	"testing"
 	"time"
 
-	mmv1alpha1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
-	inferenceservicev1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
+	kservev1alpha1 "github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+	kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	mf "github.com/manifestival/manifestival"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"go.uber.org/zap/zapcore"
 	k8srbacv1 "k8s.io/api/rbac/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	predictorv1 "github.com/kserve/modelmesh-serving/apis/serving/v1alpha1"
-	kservev1beta1 "github.com/kserve/modelmesh-serving/apis/serving/v1beta1"
 	"github.com/manifestival/manifestival"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -110,16 +108,14 @@ var _ = BeforeSuite(func() {
 
 	// Register API objects
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme.Scheme))
-	utilruntime.Must(predictorv1.AddToScheme(scheme.Scheme))
-	utilruntime.Must(inferenceservicev1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(kservev1alpha1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(kservev1beta1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(routev1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(virtualservicev1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(maistrav1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(monitoringv1.AddToScheme(scheme.Scheme))
-	utilruntime.Must(mmv1alpha1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(corev1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(istiosecurityv1beta1.AddToScheme(scheme.Scheme))
-	utilruntime.Must(kservev1beta1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(telemetryv1alpha1.AddToScheme(scheme.Scheme))
 
 	// +kubebuilder:scaffold:scheme
@@ -180,10 +176,9 @@ var _ = AfterSuite(func() {
 // Cleanup resources to not contaminate between tests
 var _ = AfterEach(func() {
 	inNamespace := client.InNamespace(WorkingNamespace)
-	Expect(cli.DeleteAllOf(context.TODO(), &mmv1alpha1.ServingRuntime{}, inNamespace)).ToNot(HaveOccurred())
-	Expect(cli.DeleteAllOf(context.TODO(), &inferenceservicev1.InferenceService{}, inNamespace)).ToNot(HaveOccurred())
+	Expect(cli.DeleteAllOf(context.TODO(), &kservev1alpha1.ServingRuntime{}, inNamespace)).ToNot(HaveOccurred())
+	Expect(cli.DeleteAllOf(context.TODO(), &kservev1beta1.InferenceService{}, inNamespace)).ToNot(HaveOccurred())
 	Expect(cli.DeleteAllOf(context.TODO(), &routev1.Route{}, inNamespace)).ToNot(HaveOccurred())
-	Expect(cli.DeleteAllOf(context.TODO(), &mmv1alpha1.ServingRuntime{}, inNamespace)).ToNot(HaveOccurred())
 	Expect(cli.DeleteAllOf(context.TODO(), &monitoringv1.ServiceMonitor{}, inNamespace)).ToNot(HaveOccurred())
 	Expect(cli.DeleteAllOf(context.TODO(), &k8srbacv1.RoleBinding{}, inNamespace)).ToNot(HaveOccurred())
 	Expect(cli.DeleteAllOf(context.TODO(), &corev1.Secret{}, inNamespace)).ToNot(HaveOccurred())