fixed linter

Author: capri-xiyue

api/v1/inferencepool_types.go

@@ -43,7 +43,7 @@ type InferencePool struct {
 	// Status defines the observed state of the InferencePool.
 	//
 	// +optional
-	Status InferencePoolStatus `json:"status,omitempty"`
+	Status *InferencePoolStatus `json:"status,omitempty"`
 }
 
 // InferencePoolList contains a list of InferencePools.
@@ -75,7 +75,7 @@ type InferencePoolSpec struct {
 	// +kubebuilder:validation:MaxItems=1
 	// +listType=atomic
 	// +required
-	TargetPorts []Port `json:"targetPorts,omitzero"`
+	TargetPorts []Port `json:"targetPorts,omitempty"`
 
 	// EndpointPickerRef is a reference to the Endpoint Picker extension and its
 	// associated configuration.
@@ -90,7 +90,7 @@ type Port struct {
 	// The number must be in the range 1 to 65535.
 	//
 	// +required
-	Number PortNumber `json:"number,omitzero"`
+	Number PortNumber `json:"number,omitempty"`
 }
 
 // EndpointPickerRef specifies a reference to an Endpoint Picker extension and its
@@ -117,25 +117,28 @@ type EndpointPickerRef struct {
 	//
 	// +optional
 	// +kubebuilder:default=Service
+	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer for optional struct.
 	Kind *Kind `json:"kind,omitempty"`
 
 	// Name is the name of the referent API object.
 	//
 	// +required
-	Name ObjectName `json:"name,omitzero"`
+	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").
 	//
 	// +optional
+	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer for optional struct.
 	PortNumber *PortNumber `json:"portNumber,omitempty"`
 
 	// FailureMode configures how the parent handles the case when the Endpoint Picker extension
 	// is non-responsive. When unspecified, defaults to "FailClose".
 	//
 	// +optional
 	// +kubebuilder:default="FailClose"
+	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer for optional struct.
 	FailureMode *EndpointPickerFailureMode `json:"failureMode,omitempty"`
 }
 
@@ -186,8 +189,6 @@ type ParentStatus struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=type
-	// +patchStrategy=merge
-	// +patchMergeKey=type
 	// +kubebuilder:validation:MaxItems=8
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
@@ -284,12 +285,13 @@ type ParentReference struct {
 	//
 	// +optional
 	// +kubebuilder:default=Gateway
+	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer for optional struct.
 	Kind *Kind `json:"kind,omitempty"`
 
 	// Name is the name of the referent API object.
 	//
 	// +required
-	Name ObjectName `json:"name,omitzero"`
+	Name ObjectName `json:"name,omitempty"`
 
 	// Namespace is the namespace of the referenced object. When unspecified, the local
 	// namespace is inferred.
@@ -300,5 +302,6 @@ type ParentReference struct {
 	// documentation for details: https://gateway-api.sigs.k8s.io/api-types/referencegrant/
 	//
 	// +optional
+	//nolint:kubeapilinter // ignore kubeapilinter here as we want to use pointer for optional struct.
 	Namespace *Namespace `json:"namespace,omitempty"`
 }

api/v1/shared_types.go

@@ -139,5 +139,5 @@ type LabelSelector struct {
 	// +required
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=64
-	MatchLabels map[LabelKey]LabelValue `json:"matchLabels,omitzero"`
+	MatchLabels map[LabelKey]LabelValue `json:"matchLabels,omitempty"`
 }

api/v1/zz_generated.deepcopy.go

@@ -47,7 +47,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
 	dst.ObjectMeta = src.ObjectMeta
 	dst.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(src.Spec.TargetPortNumber)}}
 	dst.Spec.EndpointPickerRef = endpointPickRef
-	dst.Status = *v1Status
+	dst.Status = v1Status
 
 	if src.Spec.Selector != nil {
 		dst.Spec.Selector.MatchLabels = make(map[v1.LabelKey]v1.LabelValue, len(src.Spec.Selector))
@@ -67,7 +67,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
 	if err != nil {
 		return err
 	}
-	status, err := convertStatusFromV1(&src.Status)
+	status, err := convertStatusFromV1(src.Status)
 	if err != nil {
 		return err
 	}
@@ -95,6 +95,9 @@ func convertStatusToV1(src *InferencePoolStatus) (*v1.InferencePoolStatus, error
 	if src == nil {
 		return nil, errors.New("src cannot be nil")
 	}
+	if src.Parents == nil {
+		return &v1.InferencePoolStatus{}, nil
+	}
 	out := &v1.InferencePoolStatus{
 		Parents: make([]v1.ParentStatus, 0, len(src.Parents)),
 	}
@@ -121,6 +124,9 @@ func convertStatusFromV1(src *v1.InferencePoolStatus) (*InferencePoolStatus, err
 	if src == nil {
 		return nil, errors.New("src cannot be nil")
 	}
+	if src.Parents == nil {
+		return &InferencePoolStatus{}, nil
+	}
 	out := &InferencePoolStatus{
 		Parents: make([]PoolStatus, 0, len(src.Parents)),
 	}

apix/v1alpha2/inferencepool_conversion.go

@@ -108,7 +108,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 						FailureMode: &v1FailureMode,
 					},
 				},
-				Status: v1.InferencePoolStatus{
+				Status: &v1.InferencePoolStatus{
 					Parents: []v1.ParentStatus{
 						{
 							ParentRef: v1.ParentReference{Name: "my-gateway"},
@@ -176,7 +176,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 					},
 					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
 				},
-				Status: v1.InferencePoolStatus{
+				Status: &v1.InferencePoolStatus{
 					Parents: []v1.ParentStatus{
 						{
 							ParentRef: v1.ParentReference{Name: "my-gateway"},
@@ -243,7 +243,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 						FailureMode: &v1FailureMode,
 					},
 				},
-				Status: v1.InferencePoolStatus{
+				Status: &v1.InferencePoolStatus{
 					Parents: []v1.ParentStatus{
 						{
 							ParentRef: v1.ParentReference{Name: "my-gateway"},
@@ -318,7 +318,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 					},
 					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
 				},
-				Status: v1.InferencePoolStatus{
+				Status: &v1.InferencePoolStatus{
 					Parents: []v1.ParentStatus{
 						{
 							ParentRef: v1.ParentReference{Name: "my-gateway"},