⚠️ Refactor reference types for IPAM (#12365)

* Refactor reference types for IPAM

* Address comments

* More comments

Author: fabriziopandini

api/ipam/v1alpha1/conversion.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
@@ -118,10 +118,10 @@ func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
-func Convert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from *ipamv1.IPAddressClaimSpec, to *IPAddressClaimSpec, scope apiconversion.Scope) error {
+func Convert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from *ipamv1.IPAddressClaimSpec, to *IPAddressClaimSpec, scope apimachineryconversion.Scope) error {
 	return autoConvert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from, to, scope)
 }
 
-func Convert_v1beta2_IPAddressClaimStatus_To_v1alpha1_IPAddressClaimStatus(from *ipamv1.IPAddressClaimStatus, to *IPAddressClaimStatus, scope apiconversion.Scope) error {
+func Convert_v1beta2_IPAddressClaimStatus_To_v1alpha1_IPAddressClaimStatus(from *ipamv1.IPAddressClaimStatus, to *IPAddressClaimStatus, scope apimachineryconversion.Scope) error {
 	return autoConvert_v1beta2_IPAddressClaimStatus_To_v1alpha1_IPAddressClaimStatus(from, to, scope)
 }

api/ipam/v1alpha1/conversion_test.go

@@ -22,6 +22,7 @@ import (
 	"reflect"
 	"testing"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
@@ -34,8 +35,9 @@ import (
 
 func TestFuzzyConversion(t *testing.T) {
 	t.Run("for IPAddress", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:   &ipamv1.IPAddress{},
-		Spoke: &IPAddress{},
+		Hub:         &ipamv1.IPAddress{},
+		Spoke:       &IPAddress{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{IPAddressFuzzFuncs},
 	}))
 	t.Run("for IPAddressClaim", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Hub:         &ipamv1.IPAddressClaim{},
@@ -44,9 +46,23 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
+func IPAddressFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		spokeTypedLocalObjectReference,
+	}
+}
+
+func spokeTypedLocalObjectReference(in *corev1.TypedLocalObjectReference, c randfill.Continue) {
+	c.FillNoCustom(in)
+	if in.APIGroup != nil && *in.APIGroup == "" {
+		in.APIGroup = nil
+	}
+}
+
 func IPAddressClaimFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		hubIPAddressClaimStatus,
+		spokeTypedLocalObjectReference,
 	}
 }
 

api/ipam/v1alpha1/zz_generated.conversion.go

@@ -17,8 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
@@ -104,6 +106,42 @@ func Convert_v1beta1_IPAddressClaimStatus_To_v1beta2_IPAddressClaimStatus(in *IP
 	return nil
 }
 
+func Convert_v1_TypedLocalObjectReference_To_v1beta2_IPPoolReference(in *corev1.TypedLocalObjectReference, out *ipamv1.IPPoolReference, _ apimachineryconversion.Scope) error {
+	out.Kind = in.Kind
+	out.Name = in.Name
+	out.APIGroup = ptr.Deref(in.APIGroup, "")
+	return nil
+}
+
+func Convert_v1beta2_IPPoolReference_To_v1_TypedLocalObjectReference(in *ipamv1.IPPoolReference, out *corev1.TypedLocalObjectReference, _ apimachineryconversion.Scope) error {
+	out.Kind = in.Kind
+	out.Name = in.Name
+	if in.APIGroup != "" {
+		out.APIGroup = ptr.To(in.APIGroup)
+	}
+	return nil
+}
+
+func Convert_v1_LocalObjectReference_To_v1beta2_IPAddressReference(in *corev1.LocalObjectReference, out *ipamv1.IPAddressReference, _ apimachineryconversion.Scope) error {
+	out.Name = in.Name
+	return nil
+}
+
+func Convert_v1beta2_IPAddressReference_To_v1_LocalObjectReference(in *ipamv1.IPAddressReference, out *corev1.LocalObjectReference, _ apimachineryconversion.Scope) error {
+	out.Name = in.Name
+	return nil
+}
+
+func Convert_v1_LocalObjectReference_To_v1beta2_IPAddressClaimReference(in *corev1.LocalObjectReference, out *ipamv1.IPAddressClaimReference, _ apimachineryconversion.Scope) error {
+	out.Name = in.Name
+	return nil
+}
+
+func Convert_v1beta2_IPAddressClaimReference_To_v1_LocalObjectReference(in *ipamv1.IPAddressClaimReference, out *corev1.LocalObjectReference, _ apimachineryconversion.Scope) error {
+	out.Name = in.Name
+	return nil
+}
+
 // Implement local conversion func because conversion-gen is not aware of conversion func in other packages (see https://github.com/kubernetes/code-generator/issues/94)
 
 func Convert_v1_Condition_To_v1beta1_Condition(in *metav1.Condition, out *clusterv1beta1.Condition, s apimachineryconversion.Scope) error {

api/ipam/v1beta1/conversion.go

@@ -22,6 +22,7 @@ import (
 	"reflect"
 	"testing"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
@@ -34,8 +35,9 @@ import (
 
 func TestFuzzyConversion(t *testing.T) {
 	t.Run("for IPAddress", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:   &ipamv1.IPAddress{},
-		Spoke: &IPAddress{},
+		Hub:         &ipamv1.IPAddress{},
+		Spoke:       &IPAddress{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{IPAddressFuzzFuncs},
 	}))
 	t.Run("for IPAddressClaim", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Hub:         &ipamv1.IPAddressClaim{},
@@ -44,10 +46,24 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
+func IPAddressFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		spokeTypedLocalObjectReference,
+	}
+}
+
+func spokeTypedLocalObjectReference(in *corev1.TypedLocalObjectReference, c randfill.Continue) {
+	c.FillNoCustom(in)
+	if in.APIGroup != nil && *in.APIGroup == "" {
+		in.APIGroup = nil
+	}
+}
+
 func IPAddressClaimFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		hubIPAddressClaimStatus,
 		spokeIPAddressClaimStatus,
+		spokeTypedLocalObjectReference,
 	}
 }