Final bits of API cleanup

Author: robscott

api/v1/inferencepool_types.go

@@ -24,7 +24,7 @@ import (
 //
 // +kubebuilder:object:root=true
 // TODO: change the annotation once it gets officially approved
-// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=unapproved, experimental-only"
+// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes-sigs/gateway-api-inference-extension/pull/1173"
 // +kubebuilder:resource:shortName=infpool
 // +kubebuilder:subresource:status
 // +kubebuilder:storageversion
@@ -43,7 +43,8 @@ type InferencePool struct {
 	// Status defines the observed state of the InferencePool.
 	//
 	// +optional
-	Status *InferencePoolStatus `json:"status,omitempty"`
+	//nolint:kubeapilinter // status should not be a pointer.
+	Status InferencePoolStatus `json:"status,omitempty"`
 }
 
 // InferencePoolList contains a list of InferencePools.

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
 	}

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"},

apix/v1alpha2/inferencepool_conversion_test.go

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    api-approved.kubernetes.io: unapproved, experimental-only
+    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api-inference-extension/pull/1173
     inference.networking.k8s.io/bundle-version: main-dev
   creationTimestamp: null
   name: inferencepools.inference.networking.k8s.io