Merge pull request #9730 from sbueringer/pr-ipam-alias

🌱 Enforce IPAM import alias
kubernetes-sigs · Nov 16, 2023 · 672e2a1 · 672e2a1
2 parents 83d7969 + 0784322
commit 672e2a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -139,6 +139,9 @@ linters-settings:
         alias: addonsv1alpha4
       - pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1beta1
         alias: addonsv1
+      # CAPI exp IPAM
+      - pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1
+        alias: ipamv1
       # CAPI exp runtime
       - pkg: sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1
         alias: runtimev1

diff --git a/exp/ipam/api/v1alpha1/conversion.go b/exp/ipam/api/v1alpha1/conversion.go
@@ -19,53 +19,53 @@ package v1alpha1
 import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
+	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 )
 
 func (src *IPAddress) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*ipamv1beta1.IPAddress)
+	dst := dstRaw.(*ipamv1.IPAddress)
 
 	return Convert_v1alpha1_IPAddress_To_v1beta1_IPAddress(src, dst, nil)
 }
 
 func (dst *IPAddress) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*ipamv1beta1.IPAddress)
+	src := srcRaw.(*ipamv1.IPAddress)
 
 	return Convert_v1beta1_IPAddress_To_v1alpha1_IPAddress(src, dst, nil)
 }
 
 func (src *IPAddressList) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*ipamv1beta1.IPAddressList)
+	dst := dstRaw.(*ipamv1.IPAddressList)
 
 	return Convert_v1alpha1_IPAddressList_To_v1beta1_IPAddressList(src, dst, nil)
 }
 
 func (dst *IPAddressList) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*ipamv1beta1.IPAddressList)
+	src := srcRaw.(*ipamv1.IPAddressList)
 
 	return Convert_v1beta1_IPAddressList_To_v1alpha1_IPAddressList(src, dst, nil)
 }
 
 func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*ipamv1beta1.IPAddressClaim)
+	dst := dstRaw.(*ipamv1.IPAddressClaim)
 
 	return Convert_v1alpha1_IPAddressClaim_To_v1beta1_IPAddressClaim(src, dst, nil)
 }
 
 func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*ipamv1beta1.IPAddressClaim)
+	src := srcRaw.(*ipamv1.IPAddressClaim)
 
 	return Convert_v1beta1_IPAddressClaim_To_v1alpha1_IPAddressClaim(src, dst, nil)
 }
 
 func (src *IPAddressClaimList) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*ipamv1beta1.IPAddressClaimList)
+	dst := dstRaw.(*ipamv1.IPAddressClaimList)
 
 	return Convert_v1alpha1_IPAddressClaimList_To_v1beta1_IPAddressClaimList(src, dst, nil)
 }
 
 func (dst *IPAddressClaimList) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*ipamv1beta1.IPAddressClaimList)
+	src := srcRaw.(*ipamv1.IPAddressClaimList)
 
 	return Convert_v1beta1_IPAddressClaimList_To_v1alpha1_IPAddressClaimList(src, dst, nil)
 }
diff --git a/exp/ipam/api/v1alpha1/conversion_test.go b/exp/ipam/api/v1alpha1/conversion_test.go
@@ -21,18 +21,18 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 
-	ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
+	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
 func TestFuzzyConversion(t *testing.T) {
 	t.Run("for IPAddress", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:         &ipamv1beta1.IPAddress{},
+		Hub:         &ipamv1.IPAddress{},
 		Spoke:       &IPAddress{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{},
 	}))
 	t.Run("for IPAddressClaim", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:         &ipamv1beta1.IPAddressClaim{},
+		Hub:         &ipamv1.IPAddressClaim{},
 		Spoke:       &IPAddressClaim{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{},
 	}))