fixed conversion

Author: capri-xiyue

apix/v1alpha2/inferencepool_conversion.go

@@ -19,108 +19,92 @@ package v1alpha2
 import (
 	"fmt"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 
 	v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
 )
 
 // ConvertTo converts this InferencePool (v1alpha2) to the v1 version.
-func (src *InferencePool) ConvertTo() (*v1.InferencePool, error) {
-	if src == nil {
-		return nil, nil
+func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
+	if dst == nil {
+		return fmt.Errorf("dst cannot be nil")
 	}
-
-	v1Extension, err := convertExtensionRefToV1(*src.Spec.ExtensionRef)
+	v1Extension, err := convertExtensionRefToV1(src.Spec.ExtensionRef)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	v1Status, err := converStatusToV1(src.Status)
+	v1Status, err := convertStatusToV1(&src.Status)
 	if err != nil {
-		return nil, err
-	}
-	dst := &v1.InferencePool{
-		TypeMeta:   src.TypeMeta,
-		ObjectMeta: src.ObjectMeta,
-		Spec: v1.InferencePoolSpec{
-			TargetPortNumber: src.Spec.TargetPortNumber,
-			ExtensionRef:     v1Extension,
-		},
-		Status: *v1Status,
+		return err
 	}
+	dst.TypeMeta = src.TypeMeta
+	dst.ObjectMeta = src.ObjectMeta
+	dst.Spec.TargetPortNumber = src.Spec.TargetPortNumber
+	dst.Spec.ExtensionRef = v1Extension
+	dst.Status = *v1Status
 	if src.Spec.Selector != nil {
 		dst.Spec.Selector.MatchLabels = make(map[v1.LabelKey]v1.LabelValue, len(src.Spec.Selector))
 		for k, v := range src.Spec.Selector {
 			dst.Spec.Selector.MatchLabels[v1.LabelKey(k)] = v1.LabelValue(v)
 		}
 	}
-	return dst, nil
+	return nil
 }
 
 // ConvertFrom converts from the v1 version to this version (v1alpha2).
-func ConvertFrom(src *v1.InferencePool) (*InferencePool, error) {
+func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
 	if src == nil {
-		return nil, nil
+		return fmt.Errorf("src cannot be nil")
 	}
-
-	extensionRef, err := convertExtensionRefFromV1(*src.Spec.ExtensionRef)
+	extensionRef, err := convertExtensionRefFromV1(src.Spec.ExtensionRef)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	status, err := converStatusFromV1(src.Status)
+	status, err := convertStatusFromV1(&src.Status)
 	if err != nil {
-		return nil, err
-	}
-	dst := &InferencePool{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "InferencePool",
-			APIVersion: "inference.networking.x-k8s.io/v1alpha2",
-		},
-		ObjectMeta: src.ObjectMeta,
-		Spec: InferencePoolSpec{
-			TargetPortNumber: src.Spec.TargetPortNumber,
-			ExtensionRef:     extensionRef,
-		},
-		Status: *status,
+		return err
 	}
-
+	dst.TypeMeta = src.TypeMeta
+	dst.ObjectMeta = src.ObjectMeta
+	dst.Spec.TargetPortNumber = src.Spec.TargetPortNumber
+	dst.Spec.ExtensionRef = extensionRef
+	dst.Status = *status
 	if src.Spec.Selector.MatchLabels != nil {
 		dst.Spec.Selector = make(map[LabelKey]LabelValue, len(src.Spec.Selector.MatchLabels))
 		for k, v := range src.Spec.Selector.MatchLabels {
 			dst.Spec.Selector[LabelKey(k)] = LabelValue(v)
 		}
 	}
-
-	return dst, nil
+	return nil
 }
 
-func converStatusToV1(src InferencePoolStatus) (*v1.InferencePoolStatus, error) {
-	u, err := toUnstructured(&src)
+func convertStatusToV1(src *InferencePoolStatus) (*v1.InferencePoolStatus, error) {
+	u, err := toUnstructured(src)
 	if err != nil {
 		return nil, err
 	}
 	return convert[v1.InferencePoolStatus](u)
 }
 
-func converStatusFromV1(src v1.InferencePoolStatus) (*InferencePoolStatus, error) {
-	u, err := toUnstructured(&src)
+func convertStatusFromV1(src *v1.InferencePoolStatus) (*InferencePoolStatus, error) {
+	u, err := toUnstructured(src)
 	if err != nil {
 		return nil, err
 	}
 	return convert[InferencePoolStatus](u)
 }
 
-func convertExtensionRefToV1(src Extension) (*v1.Extension, error) {
-	u, err := toUnstructured(&src)
+func convertExtensionRefToV1(src *Extension) (*v1.Extension, error) {
+	u, err := toUnstructured(src)
 	if err != nil {
 		return nil, err
 	}
 	return convert[v1.Extension](u)
 }
 
-func convertExtensionRefFromV1(src v1.Extension) (*Extension, error) {
-	u, err := toUnstructured(&src)
+func convertExtensionRefFromV1(src *v1.Extension) (*Extension, error) {
+	u, err := toUnstructured(src)
 	if err != nil {
 		return nil, err
 	}

apix/v1alpha2/inferencepool_conversion_test.go

@@ -47,6 +47,10 @@ func TestInferencePoolConvertTo(t *testing.T) {
 		{
 			name: "full conversion from v1alpha2 to v1 including status",
 			src: &InferencePool{
+				TypeMeta: metav1.TypeMeta{
+					Kind:       "InferencePool",
+					APIVersion: "inference.networking.x-k8s.io/v1alpha2",
+				},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pool",
 					Namespace: "test-ns",
@@ -81,6 +85,10 @@ func TestInferencePoolConvertTo(t *testing.T) {
 				},
 			},
 			want: &v1.InferencePool{
+				TypeMeta: metav1.TypeMeta{
+					Kind:       "InferencePool",
+					APIVersion: "inference.networking.x-k8s.io/v1alpha2",
+				},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pool",
 					Namespace: "test-ns",
@@ -118,17 +126,12 @@ func TestInferencePoolConvertTo(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name:    "nil source should return nil and no error",
-			src:     nil,
-			want:    nil,
-			wantErr: false,
-		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := tt.src.ConvertTo()
+			got := &v1.InferencePool{}
+			err := tt.src.ConvertTo(got)
 			if (err != nil) != tt.wantErr {
 				t.Fatalf("ConvertTo() error = %v, wantErr %v", err, tt.wantErr)
 			}
@@ -149,6 +152,10 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 		{
 			name: "full conversion from v1 to v1alpha2 including status",
 			src: &v1.InferencePool{
+				TypeMeta: metav1.TypeMeta{
+					Kind:       "InferencePool",
+					APIVersion: "inference.networking.k8s.io/v1",
+				},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pool",
 					Namespace: "test-ns",
@@ -187,7 +194,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 			want: &InferencePool{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "InferencePool",
-					APIVersion: "inference.networking.x-k8s.io/v1alpha2",
+					APIVersion: "inference.networking.k8s.io/v1",
 				},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pool",
@@ -225,16 +232,17 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name:    "nil source should return nil and no error",
+			name:    "nil source",
 			src:     nil,
-			want:    nil,
-			wantErr: false,
+			want:    &InferencePool{},
+			wantErr: true,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := ConvertFrom(tt.src)
+			got := &InferencePool{}
+			err := got.ConvertFrom(tt.src)
 			if (err != nil) != tt.wantErr {
 				t.Fatalf("ConvertFrom() error = %v, wantErr %v", err, tt.wantErr)
 			}