clean up ports

Author: capri-xiyue

apix/v1/inferencepool_types.go

@@ -96,6 +96,7 @@ type Port struct {
 
 // EndpointPickerRef specifies a reference to an Endpoint Picker extension and its
 // associated configuration.
+// +kubebuilder:validation:XValidation:rule="self.kind != 'Service' || has(self.port)",message="port is required when kind is 'Service'"
 type EndpointPickerRef struct {
 	// Group is the group of the referent API object. When unspecified, the default value
 	// is "", representing the Core API group.
@@ -125,13 +126,15 @@ type EndpointPickerRef struct {
 	// +required
 	Name ObjectName `json:"name,omitempty"`
 
-	// PortNumber is the port number of the Endpoint Picker extension service. When unspecified,
-	// implementations SHOULD infer a default value of 9002 when the kind field is "Service" or
-	// unspecified (defaults to "Service").
+	// Port is the port of the Endpoint Picker extension service.
+	//
+	// Port is required when the referent is a Kubernetes Service. In this
+	// case, the port number is the service port number, not the target port.
+	// For other resources, destination port might be derived from the referent
+	// resource or this field.
 	//
 	// +optional
-	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer as zero means all ports in convention, we don't make to use 0 to indicate not set.
-	PortNumber *PortNumber `json:"portNumber,omitempty"`
+	Port *Port `json:"port,omitempty"`
 
 	// FailureMode configures how the parent handles the case when the Endpoint Picker extension
 	// is non-responsive. When unspecified, defaults to "FailClose".

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

@@ -89,18 +89,32 @@ spec:
                       maxLength: 253
                       minLength: 1
                       type: string
-                    portNumber:
+                    port:
                       description: |-
-                        PortNumber is the port number of the Endpoint Picker extension service. When unspecified,
-                        implementations SHOULD infer a default value of 9002 when the kind field is "Service" or
-                        unspecified (defaults to "Service").
-                      format: int32
-                      maximum: 65535
-                      minimum: 1
-                      type: integer
+                        Port is the port of the Endpoint Picker extension service.
+                        
+                        Port is required when the referent is a Kubernetes Service. In this
+                        case, the port number is the service port number, not the target port.
+                        For other resources, destination port might be derived from the referent
+                        resource or this field.
+                      properties:
+                        number:
+                          description: |-
+                            Number defines the port number to access the selected model server Pods.
+                            The number must be in the range 1 to 65535.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                      required:
+                        - number
+                      type: object
                   required:
                     - name
                   type: object
+                  x-kubernetes-validations:
+                    - message: port is required when kind is 'Service'
+                      rule: self.kind != 'Service' || has(self.port)
                 selector:
                   description: |-
                     Selector determines which Pods are members of this inference pool.