Code updates after API type changes

Author: robscott

pkg/epp/controller/inferencemodel_reconciler.go

@@ -58,7 +58,7 @@ func (c *InferenceModelReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		notFound = true
 	}
 
-	if notFound || !infModel.DeletionTimestamp.IsZero() || infModel.Spec.PoolRef.Name != c.PoolNamespacedName.Name {
+	if notFound || !infModel.DeletionTimestamp.IsZero() || infModel.Spec.PoolRef.Name != v1alpha2.ObjectName(c.PoolNamespacedName.Name) {
 		// InferenceModel object got deleted or changed the referenced pool.
 		err := c.handleModelDeleted(ctx, req.NamespacedName)
 		return ctrl.Result{}, err
@@ -128,5 +128,5 @@ func (c *InferenceModelReconciler) SetupWithManager(ctx context.Context, mgr ctr
 }
 
 func (c *InferenceModelReconciler) eventPredicate(infModel *v1alpha2.InferenceModel) bool {
-	return (infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name) && (infModel.GetNamespace() == c.PoolNamespacedName.Namespace)
+	return (infModel.Spec.PoolRef.Name == v1alpha2.ObjectName(c.PoolNamespacedName.Name)) && (infModel.GetNamespace() == c.PoolNamespacedName.Namespace)
 }

pkg/epp/datastore/datastore.go

@@ -184,7 +184,7 @@ func (ds *datastore) ModelResync(ctx context.Context, c client.Client, modelName
 	for i := range models.Items {
 		m := &models.Items[i]
 		if m.Spec.ModelName != modelName || // The index should filter those out, but just in case!
-			m.Spec.PoolRef.Name != ds.pool.Name || // We don't care about other pools, we could setup an index on this too!
+			m.Spec.PoolRef.Name != v1alpha2.ObjectName(ds.pool.Name) || // We don't care about other pools, we could setup an index on this too!
 			!m.DeletionTimestamp.IsZero() { // ignore objects marked for deletion
 			continue
 		}

pkg/epp/util/testing/wrappers.go

@@ -110,7 +110,7 @@ func (m *InferenceModelWrapper) ModelName(modelName string) *InferenceModelWrapp
 }
 
 func (m *InferenceModelWrapper) PoolName(poolName string) *InferenceModelWrapper {
-	m.Spec.PoolRef = v1alpha2.PoolObjectReference{Name: poolName}
+	m.Spec.PoolRef = v1alpha2.PoolObjectReference{Name: v1alpha2.ObjectName(poolName)}
 	return m
 }
 

test/utils/wrappers.go

@@ -58,9 +58,9 @@ func (m *InferenceModelWrapper) SetCriticality(level v1alpha2.Criticality) *Infe
 // for group/kind and name as the PoolObjectReference name.
 func (m *InferenceModelWrapper) SetPoolRef(name string) *InferenceModelWrapper {
 	ref := v1alpha2.PoolObjectReference{
-		Group: v1alpha2.GroupVersion.Group,
+		Group: v1alpha2.Group(v1alpha2.GroupVersion.Group),
 		Kind:  "inferencepools",
-		Name:  name,
+		Name:  v1alpha2.ObjectName(name),
 	}
 	m.Spec.PoolRef = ref
 	return m