Skip to content

🌱 Remove unused List conversion funcs #12054

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

Merged
merged 1 commit into from
Apr 4, 2025
Merged

🌱 Remove unused List conversion funcs #12054

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions api/addons/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ limitations under the License.

package v1beta2

func (*ClusterResourceSet) Hub() {}
func (*ClusterResourceSetList) Hub() {}
func (*ClusterResourceSetBinding) Hub() {}
func (*ClusterResourceSetBindingList) Hub() {}
func (*ClusterResourceSet) Hub() {}
func (*ClusterResourceSetBinding) Hub() {}
18 changes: 6 additions & 12 deletions api/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,9 @@ limitations under the License.

package v1beta2

func (*Cluster) Hub() {}
func (*ClusterList) Hub() {}
func (*ClusterClass) Hub() {}
func (*ClusterClassList) Hub() {}
func (*Machine) Hub() {}
func (*MachineList) Hub() {}
func (*MachineSet) Hub() {}
func (*MachineSetList) Hub() {}
func (*MachineDeployment) Hub() {}
func (*MachineDeploymentList) Hub() {}
func (*MachineHealthCheck) Hub() {}
func (*MachineHealthCheckList) Hub() {}
func (*Cluster) Hub() {}
func (*ClusterClass) Hub() {}
func (*Machine) Hub() {}
func (*MachineSet) Hub() {}
func (*MachineDeployment) Hub() {}
func (*MachineHealthCheck) Hub() {}
6 changes: 2 additions & 4 deletions bootstrap/kubeadm/api/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ limitations under the License.

package v1beta2

func (*KubeadmConfig) Hub() {}
func (*KubeadmConfigList) Hub() {}
func (*KubeadmConfigTemplate) Hub() {}
func (*KubeadmConfigTemplateList) Hub() {}
func (*KubeadmConfig) Hub() {}
func (*KubeadmConfigTemplate) Hub() {}

func (*ClusterConfiguration) Hub() {}
func (*ClusterStatus) Hub() {}
Expand Down
6 changes: 2 additions & 4 deletions controlplane/kubeadm/api/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ limitations under the License.

package v1beta2

func (*KubeadmControlPlane) Hub() {}
func (*KubeadmControlPlaneList) Hub() {}
func (*KubeadmControlPlaneTemplate) Hub() {}
func (*KubeadmControlPlaneTemplateList) Hub() {}
func (*KubeadmControlPlane) Hub() {}
func (*KubeadmControlPlaneTemplate) Hub() {}
3 changes: 1 addition & 2 deletions exp/api/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ limitations under the License.

package v1beta2

func (*MachinePool) Hub() {}
func (*MachinePoolList) Hub() {}
func (*MachinePool) Hub() {}
24 changes: 0 additions & 24 deletions exp/ipam/api/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,6 @@ func (dst *IPAddress) ConvertFrom(srcRaw conversion.Hub) error {
return Convert_v1beta2_IPAddress_To_v1alpha1_IPAddress(src, dst, nil)
}

func (src *IPAddressList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*ipamv1.IPAddressList)

return Convert_v1alpha1_IPAddressList_To_v1beta2_IPAddressList(src, dst, nil)
}

func (dst *IPAddressList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*ipamv1.IPAddressList)

return Convert_v1beta2_IPAddressList_To_v1alpha1_IPAddressList(src, dst, nil)
}

func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*ipamv1.IPAddressClaim)

Expand Down Expand Up @@ -107,18 +95,6 @@ func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *IPAddressClaimList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*ipamv1.IPAddressClaimList)

return Convert_v1alpha1_IPAddressClaimList_To_v1beta2_IPAddressClaimList(src, dst, nil)
}

func (dst *IPAddressClaimList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*ipamv1.IPAddressClaimList)

return Convert_v1beta2_IPAddressClaimList_To_v1alpha1_IPAddressClaimList(src, dst, nil)
}

func Convert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from *ipamv1.IPAddressClaimSpec, to *IPAddressClaimSpec, scope apiconversion.Scope) error {
return autoConvert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from, to, scope)
}
Expand Down
6 changes: 2 additions & 4 deletions exp/ipam/api/v1beta2/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ limitations under the License.

package v1beta2

func (*IPAddress) Hub() {}
func (*IPAddressList) Hub() {}
func (*IPAddressClaim) Hub() {}
func (*IPAddressClaimList) Hub() {}
func (*IPAddress) Hub() {}
func (*IPAddressClaim) Hub() {}
24 changes: 0 additions & 24 deletions internal/apis/addons/v1alpha3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ func (dst *ClusterResourceSet) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *ClusterResourceSetList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetList)

return Convert_v1alpha3_ClusterResourceSetList_To_v1beta2_ClusterResourceSetList(src, dst, nil)
}

func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*addonsv1.ClusterResourceSetList)

return Convert_v1beta2_ClusterResourceSetList_To_v1alpha3_ClusterResourceSetList(src, dst, nil)
}

func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)

Expand Down Expand Up @@ -95,18 +83,6 @@ func (dst *ClusterResourceSetBinding) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *ClusterResourceSetBindingList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBindingList)

return Convert_v1alpha3_ClusterResourceSetBindingList_To_v1beta2_ClusterResourceSetBindingList(src, dst, nil)
}

func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*addonsv1.ClusterResourceSetBindingList)

return Convert_v1beta2_ClusterResourceSetBindingList_To_v1alpha3_ClusterResourceSetBindingList(src, dst, nil)
}

// Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec is a conversion function.
func Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
// Spec.ClusterName does not exist in ClusterResourceSetBinding v1alpha3 API.
Expand Down
24 changes: 0 additions & 24 deletions internal/apis/addons/v1alpha4/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ func (dst *ClusterResourceSet) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *ClusterResourceSetList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetList)

return Convert_v1alpha4_ClusterResourceSetList_To_v1beta2_ClusterResourceSetList(src, dst, nil)
}

func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*addonsv1.ClusterResourceSetList)

return Convert_v1beta2_ClusterResourceSetList_To_v1alpha4_ClusterResourceSetList(src, dst, nil)
}

func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)

Expand Down Expand Up @@ -95,18 +83,6 @@ func (dst *ClusterResourceSetBinding) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *ClusterResourceSetBindingList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBindingList)

return Convert_v1alpha4_ClusterResourceSetBindingList_To_v1beta2_ClusterResourceSetBindingList(src, dst, nil)
}

func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*addonsv1.ClusterResourceSetBindingList)

return Convert_v1beta2_ClusterResourceSetBindingList_To_v1alpha4_ClusterResourceSetBindingList(src, dst, nil)
}

// Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec is a conversion function.
func Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
// Spec.ClusterName does not exist in ClusterResourceSetBinding v1alpha4 API.
Expand Down
24 changes: 0 additions & 24 deletions internal/apis/bootstrap/kubeadm/v1alpha3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,6 @@ func (dst *KubeadmConfig) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *KubeadmConfigList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigList)

return Convert_v1alpha3_KubeadmConfigList_To_v1beta2_KubeadmConfigList(src, dst, nil)
}

func (dst *KubeadmConfigList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*bootstrapv1.KubeadmConfigList)

return Convert_v1beta2_KubeadmConfigList_To_v1alpha3_KubeadmConfigList(src, dst, nil)
}

func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplate)

Expand Down Expand Up @@ -174,18 +162,6 @@ func (dst *KubeadmConfigTemplate) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *KubeadmConfigTemplateList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplateList)

return Convert_v1alpha3_KubeadmConfigTemplateList_To_v1beta2_KubeadmConfigTemplateList(src, dst, nil)
}

func (dst *KubeadmConfigTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*bootstrapv1.KubeadmConfigTemplateList)

return Convert_v1beta2_KubeadmConfigTemplateList_To_v1alpha3_KubeadmConfigTemplateList(src, dst, nil)
}

func Convert_v1alpha3_KubeadmConfigStatus_To_v1beta2_KubeadmConfigStatus(in *KubeadmConfigStatus, out *bootstrapv1.KubeadmConfigStatus, s apiconversion.Scope) error {
// KubeadmConfigStatus.BootstrapData has been removed in v1alpha4 because its content has been moved to the bootstrap data secret, value will be lost during conversion.
return autoConvert_v1alpha3_KubeadmConfigStatus_To_v1beta2_KubeadmConfigStatus(in, out, s)
Expand Down
24 changes: 0 additions & 24 deletions internal/apis/bootstrap/kubeadm/v1alpha4/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,6 @@ func (dst *KubeadmConfig) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *KubeadmConfigList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigList)

return Convert_v1alpha4_KubeadmConfigList_To_v1beta2_KubeadmConfigList(src, dst, nil)
}

func (dst *KubeadmConfigList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*bootstrapv1.KubeadmConfigList)

return Convert_v1beta2_KubeadmConfigList_To_v1alpha4_KubeadmConfigList(src, dst, nil)
}

func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplate)

Expand Down Expand Up @@ -161,18 +149,6 @@ func (dst *KubeadmConfigTemplate) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *KubeadmConfigTemplateList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplateList)

return Convert_v1alpha4_KubeadmConfigTemplateList_To_v1beta2_KubeadmConfigTemplateList(src, dst, nil)
}

func (dst *KubeadmConfigTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*bootstrapv1.KubeadmConfigTemplateList)

return Convert_v1beta2_KubeadmConfigTemplateList_To_v1alpha4_KubeadmConfigTemplateList(src, dst, nil)
}

// Convert_v1beta2_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec is an autogenerated conversion function.
func Convert_v1beta2_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, out *KubeadmConfigSpec, s apiconversion.Scope) error {
// KubeadmConfigSpec.Ignition does not exist in kubeadm v1alpha4 API.
Expand Down
12 changes: 0 additions & 12 deletions internal/apis/controlplane/kubeadm/v1alpha3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,6 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func (src *KubeadmControlPlaneList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneList)

return Convert_v1alpha3_KubeadmControlPlaneList_To_v1beta2_KubeadmControlPlaneList(src, dst, nil)
}

func (dst *KubeadmControlPlaneList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*controlplanev1.KubeadmControlPlaneList)

return Convert_v1beta2_KubeadmControlPlaneList_To_v1alpha3_KubeadmControlPlaneList(src, dst, nil)
}

func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlaneSpec(in *controlplanev1.KubeadmControlPlaneSpec, out *KubeadmControlPlaneSpec, s apiconversion.Scope) error {
out.UpgradeAfter = in.RolloutAfter
out.InfrastructureTemplate = in.MachineTemplate.InfrastructureRef
Expand Down
24 changes: 0 additions & 24 deletions internal/apis/controlplane/kubeadm/v1alpha4/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,6 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *KubeadmControlPlaneList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneList)

return Convert_v1alpha4_KubeadmControlPlaneList_To_v1beta2_KubeadmControlPlaneList(src, dst, nil)
}

func (dst *KubeadmControlPlaneList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*controlplanev1.KubeadmControlPlaneList)

return Convert_v1beta2_KubeadmControlPlaneList_To_v1alpha4_KubeadmControlPlaneList(src, dst, nil)
}

func (src *KubeadmControlPlaneTemplate) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneTemplate)

Expand Down Expand Up @@ -139,18 +127,6 @@ func (dst *KubeadmControlPlaneTemplate) ConvertFrom(srcRaw conversion.Hub) error
return utilconversion.MarshalData(src, dst)
}

func (src *KubeadmControlPlaneTemplateList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneTemplateList)

return Convert_v1alpha4_KubeadmControlPlaneTemplateList_To_v1beta2_KubeadmControlPlaneTemplateList(src, dst, nil)
}

func (dst *KubeadmControlPlaneTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*controlplanev1.KubeadmControlPlaneTemplateList)

return Convert_v1beta2_KubeadmControlPlaneTemplateList_To_v1alpha4_KubeadmControlPlaneTemplateList(src, dst, nil)
}

func Convert_v1alpha4_KubeadmControlPlaneSpec_To_v1beta2_KubeadmControlPlaneTemplateResourceSpec(in *KubeadmControlPlaneSpec, out *controlplanev1.KubeadmControlPlaneTemplateResourceSpec, s apiconversion.Scope) error {
out.MachineTemplate = &controlplanev1.KubeadmControlPlaneTemplateMachineTemplate{
NodeDrainTimeout: in.MachineTemplate.NodeDrainTimeout,
Expand Down
12 changes: 0 additions & 12 deletions internal/apis/core/exp/v1alpha3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,6 @@ func (dst *MachinePool) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *MachinePoolList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*expv1.MachinePoolList)

return Convert_v1alpha3_MachinePoolList_To_v1beta2_MachinePoolList(src, dst, nil)
}

func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*expv1.MachinePoolList)

return Convert_v1beta2_MachinePoolList_To_v1alpha3_MachinePoolList(src, dst, nil)
}

func Convert_v1alpha3_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in *clusterv1alpha3.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error {
return clusterv1alpha3.Convert_v1alpha3_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in, out, s)
}
Expand Down
12 changes: 0 additions & 12 deletions internal/apis/core/exp/v1alpha4/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@ func (dst *MachinePool) ConvertFrom(srcRaw conversion.Hub) error {
return utilconversion.MarshalData(src, dst)
}

func (src *MachinePoolList) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*expv1.MachinePoolList)

return Convert_v1alpha4_MachinePoolList_To_v1beta2_MachinePoolList(src, dst, nil)
}

func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*expv1.MachinePoolList)

return Convert_v1beta2_MachinePoolList_To_v1alpha4_MachinePoolList(src, dst, nil)
}

func Convert_v1alpha4_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in *clusterv1alpha4.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error {
return clusterv1alpha4.Convert_v1alpha4_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in, out, s)
}
Expand Down
Loading
Loading