merge conflicts

Author: capri-xiyue

api/v1/inferencepool_types.go

@@ -66,17 +66,25 @@ type InferencePoolSpec struct {
 	// +required
 	Selector LabelSelector `json:"selector,omitempty,omitzero"`
 
-	// TargetPortNumber defines the port number to access the selected model server Pods.
+	// +kubebuilder:validation:MinItems=1
+	// +kubebuilder:validation:MaxItems=1
+	// +listType=map
+	// +listMapKey=number
+	TargetPorts []Port `json:"targetPorts"`
+
+	// Extension configures an endpoint picker as an extension service.
+	// +optional
+	ExtensionRef *Extension `json:"extensionRef,omitempty,omitzero"`
+}
+
+type Port struct {
+	// Number defines the port number to access the selected model server Pods.
 	// The number must be in the range 1 to 65535.
 	//
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=65535
-	// +required
-	TargetPortNumber int32 `json:"targetPortNumber,omitempty"`
-
-	// Extension configures an endpoint picker as an extension service.
-	// +optional
-	ExtensionRef Extension `json:"extensionRef,omitempty,omitzero"`
+	// +kubebuilder:validation:Required
+	Number PortNumber `json:"number"`
 }
 
 // Extension specifies how to configure an extension that runs the endpoint picker.

api/v1/zz_generated.deepcopy.go

@@ -58,7 +58,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
 	if src == nil {
 		return errors.New("src cannot be nil")
 	}
-	extensionRef, err := convertExtensionRefFromV1(&src.Spec.ExtensionRef)
+	extensionRef, err := convertExtensionRefFromV1(src.Spec.ExtensionRef)
 	if err != nil {
 		return err
 	}
@@ -102,19 +102,19 @@ func convertStatusFromV1(src *v1.InferencePoolStatus) (*InferencePoolStatus, err
 	return convert[InferencePoolStatus](u)
 }
 
-func convertExtensionRefToV1(src *Extension) (v1.Extension, error) {
+func convertExtensionRefToV1(src *Extension) (*v1.Extension, error) {
 	if src == nil {
-		return v1.Extension{}, nil
+		return nil, nil
 	}
 	u, err := toUnstructured(src)
 	if err != nil {
-		return v1.Extension{}, err
+		return nil, err
 	}
 	out, err := convert[v1.Extension](u)
 	if err != nil {
-		return v1.Extension{}, err
+		return nil, err
 	}
-	return *out, nil
+	return out, nil
 }
 
 func convertExtensionRefFromV1(src *v1.Extension) (*Extension, error) {

apix/v1alpha2/inferencepool_conversion.go

@@ -99,8 +99,8 @@ func TestInferencePoolConvertTo(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
-					ExtensionRef: v1.Extension{
+					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
+					ExtensionRef: &v1.Extension{
 						Group:       &v1Group,
 						Kind:        v1Kind,
 						Name:        "my-epp-service",
@@ -174,7 +174,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
+					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
 				},
 				Status: v1.InferencePoolStatus{
 					Parents: []v1.PoolStatus{
@@ -234,8 +234,8 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
-					ExtensionRef: v1.Extension{
+					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
+					ExtensionRef: &v1.Extension{
 						Group:       &v1Group,
 						Kind:        v1Kind,
 						Name:        "my-epp-service",
@@ -316,7 +316,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 							"app": "my-model-server",
 						},
 					},
-					TargetPortNumber: 8080,
+					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
 				},
 				Status: v1.InferencePoolStatus{
 					Parents: []v1.PoolStatus{
@@ -348,7 +348,6 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 						"app": "my-model-server",
 					},
 					TargetPortNumber: 8080,
-					ExtensionRef:     &Extension{},
 				},
 				Status: InferencePoolStatus{
 					Parents: []PoolStatus{

apix/v1alpha2/inferencepool_conversion_test.go

@@ -133,8 +133,6 @@ spec:
                 - matchLabels
                 type: object
               targetPorts:
-                description: TargetPorts defines the ports to access the selected
-                  model server Pods.
                 items:
                   properties:
                     number:

config/crd/bases/inference.networking.k8s.io_inferencepools.yaml

@@ -206,7 +206,7 @@ func (m *InferencePoolWrapper) TargetPorts(p int32) *InferencePoolWrapper {
 }
 
 func (m *InferencePoolWrapper) ExtensionRef(name string) *InferencePoolWrapper {
-	m.Spec.ExtensionRef = v1.Extension{Name: v1.ObjectName(name)}
+	m.Spec.ExtensionRef = &v1.Extension{Name: v1.ObjectName(name)}
 	return m
 }