fixed kal linter

Author: capri-xiyue

api/v1/inferencepool_types.go

@@ -71,18 +71,19 @@ type InferencePoolSpec struct {
 	// +listType=map
 	// +listMapKey=number
 	// +required
-	TargetPorts []Port `json:"targetPorts"`
+	TargetPorts []Port `json:"targetPorts,omitempty"`
 
 	// Extension configures an endpoint picker as an extension service.
-	ExtensionRef *Extension `json:"extensionRef,omitempty"`
+	// +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:Required
-	Number PortNumber `json:"number"`
+	// +required
+	Number PortNumber `json:"number,omitempty"`
 }
 
 // Extension specifies how to configure an extension that runs the endpoint picker.

api/v1/zz_generated.deepcopy.go

@@ -31,7 +31,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
 	if dst == nil {
 		return errors.New("dst cannot be nil")
 	}
-	v1Extension, err := convertExtensionRefToV1(src.Spec.ExtensionRef)
+	v1Extension, err := convertExtensionRefToV1(&src.Spec.ExtensionRef)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
 	dst.TypeMeta = src.TypeMeta
 	dst.ObjectMeta = src.ObjectMeta
 	dst.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(src.Spec.TargetPortNumber)}}
-	dst.Spec.ExtensionRef = v1Extension
+	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))
@@ -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
 	}
@@ -69,7 +69,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
 	dst.TypeMeta = src.TypeMeta
 	dst.ObjectMeta = src.ObjectMeta
 	dst.Spec.TargetPortNumber = int32(src.Spec.TargetPorts[0].Number)
-	dst.Spec.ExtensionRef = extensionRef
+	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))

apix/v1alpha2/inferencepool_conversion.go

@@ -60,7 +60,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 						"app": "my-model-server",
 					},
 					TargetPortNumber: 8080,
-					ExtensionRef: &Extension{
+					ExtensionRef: Extension{
 						Group:       &group,
 						Kind:        &kind,
 						Name:        "my-epp-service",
@@ -100,7 +100,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
 						},
 					},
 					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
-					ExtensionRef: &v1.Extension{
+					ExtensionRef: v1.Extension{
 						Group:       &v1Group,
 						Kind:        v1Kind,
 						Name:        "my-epp-service",
@@ -235,7 +235,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 						},
 					},
 					TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8080))}},
-					ExtensionRef: &v1.Extension{
+					ExtensionRef: v1.Extension{
 						Group:       &v1Group,
 						Kind:        v1Kind,
 						Name:        "my-epp-service",
@@ -273,7 +273,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
 						"app": "my-model-server",
 					},
 					TargetPortNumber: 8080,
-					ExtensionRef: &Extension{
+					ExtensionRef: Extension{
 						Group:       &group,
 						Kind:        &kind,
 						Name:        "my-epp-service",

apix/v1alpha2/inferencepool_conversion_test.go

@@ -70,7 +70,8 @@ type InferencePoolSpec struct {
 	TargetPortNumber int32 `json:"targetPortNumber"`
 
 	// Extension configures an endpoint picker as an extension service.
-	ExtensionRef *Extension `json:"extensionRef,omitempty"`
+	// +optional
+	ExtensionRef Extension `json:"extensionRef,omitempty"`
 }
 
 // Extension specifies how to configure an extension that runs the endpoint picker.

apix/v1alpha2/inferencepool_types.go

@@ -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
 }
 
@@ -252,7 +252,7 @@ func (m *XInferencePoolWrapper) TargetPortNumber(p int32) *XInferencePoolWrapper
 }
 
 func (m *XInferencePoolWrapper) ExtensionRef(name string) *XInferencePoolWrapper {
-	m.Spec.ExtensionRef = &v1alpha2.Extension{Name: v1alpha2.ObjectName(name)}
+	m.Spec.ExtensionRef = v1alpha2.Extension{Name: v1alpha2.ObjectName(name)}
 	return m
 }