Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Enforce IPAM import alias #9730

Merged
merged 1 commit into from
Nov 16, 2023
Merged

🌱 Enforce IPAM import alias #9730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions exp/ipam/api/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
6 changes: 3 additions & 3 deletions exp/ipam/api/v1alpha1/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
}))
Expand Down