rebase with conversion change

Author: capri-xiyue

apix/v1alpha2/inferencepool_conversion.go

@@ -41,7 +41,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
 	}
 	dst.TypeMeta = src.TypeMeta
 	dst.ObjectMeta = src.ObjectMeta
-	dst.Spec.TargetPortNumber = src.Spec.TargetPortNumber
+	dst.Spec.TargetPorts = []v1.Port{{Number: src.Spec.TargetPortNumber}}
 	dst.Spec.ExtensionRef = v1Extension
 	dst.Status = *v1Status
 	if src.Spec.Selector != nil {
@@ -68,7 +68,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
 	}
 	dst.TypeMeta = src.TypeMeta
 	dst.ObjectMeta = src.ObjectMeta
-	dst.Spec.TargetPortNumber = src.Spec.TargetPortNumber
+	dst.Spec.TargetPortNumber = src.Spec.TargetPorts[0].Number
 	dst.Spec.ExtensionRef = extensionRef
 	dst.Status = *status
 	if src.Spec.Selector.MatchLabels != nil {

apix/v1alpha2/inferencepool_conversion_test.go

@@ -99,7 +99,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
+					TargetPorts: []v1.Port{{Number: int32(8080)}},
 					ExtensionRef: &v1.Extension{
 						Group:       &v1Group,
 						Kind:        &v1Kind,
@@ -166,7 +166,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
+					TargetPorts: []v1.Port{{Number: int32(8080)}},
 					ExtensionRef: &v1.Extension{
 						Group:       &v1Group,
 						Kind:        &v1Kind,

pkg/epp/controller/inferencepool_reconciler_test.go

@@ -80,9 +80,8 @@ func TestInferencePoolReconciler(t *testing.T) {
 	pool1 := utiltest.MakeInferencePool("pool1").
 		Namespace("pool1-ns").
 		Selector(selector_v1).
-		TargetPorts(8080).ObjRef()
-		ExtensionRef("epp-service").
-		TargetPortNumber(8080).ObjRef()
+		TargetPorts(8080).
+		ExtensionRef("epp-service").ObjRef()
 	pool1.SetGroupVersionKind(gvk)
 	pool2 := utiltest.MakeInferencePool("pool2").Namespace("pool2-ns").ExtensionRef("epp-service").ObjRef()
 	pool2.SetGroupVersionKind(gvk)
@@ -220,15 +219,15 @@ func TestXInferencePoolReconciler(t *testing.T) {
 		Version: v1alpha2.GroupVersion.Version,
 		Kind:    "InferencePool",
 	}
-	// TODO: change it to 8080
 	pool1 := utiltest.MakeXInferencePool("pool1").
 		Namespace("pool1-ns").
 		Selector(selector_v1).
-		TargetPortNumber(0).ObjRef()
-	pool2 := utiltest.MakeXInferencePool("pool2").Namespace("pool2-ns").ObjRef()
 		ExtensionRef("epp-service").
 		TargetPortNumber(8080).ObjRef()
-	pool2 := utiltest.MakeXInferencePool("pool2").Namespace("pool2-ns").ExtensionRef("epp-service").ObjRef()
+	pool2 := utiltest.MakeXInferencePool("pool2").
+		Namespace("pool2-ns").
+		ExtensionRef("epp-service").
+		TargetPortNumber(8080).ObjRef()
 	pool1.SetGroupVersionKind(gvk)
 	pool2.SetGroupVersionKind(gvk)
 
@@ -290,8 +289,7 @@ func TestXInferencePoolReconciler(t *testing.T) {
 	if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
 		t.Errorf("Unexpected pool get error: %v", err)
 	}
-	// TODO: change it later to 9090
-	newPool1.Spec.TargetPortNumber = 0
+	newPool1.Spec.TargetPortNumber = 9090
 	if err := fakeClient.Update(ctx, newPool1, &client.UpdateOptions{}); err != nil {
 		t.Errorf("Unexpected pool update error: %v", err)
 	}
@@ -329,7 +327,9 @@ func xDiffStore(t *testing.T, datastore datastore.Datastore, params xDiffStorePa
 		return ""
 	}
 
-	gotXPool, err := v1alpha2.ConvertFrom(gotPool)
+	gotXPool := &v1alpha2.InferencePool{}
+
+	err := gotXPool.ConvertFrom(gotPool)
 	if err != nil {
 		t.Fatalf("failed to convert unstructured to InferencePool: %v", err)
 	}