Skip to content

Commit 451c1ba

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12054 from sbueringer/pr-drop-conversion-list
🌱 Remove unused List conversion funcs
2 parents 9dddcb7 + 56bb142 commit 451c1ba

File tree

23 files changed

+20
-460
lines changed

23 files changed

+20
-460
lines changed

‎api/addons/v1beta2/conversion.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*ClusterResourceSet) Hub() {}
20-
func (*ClusterResourceSetList) Hub() {}
21-
func (*ClusterResourceSetBinding) Hub() {}
22-
func (*ClusterResourceSetBindingList) Hub() {}
19+
func (*ClusterResourceSet) Hub() {}
20+
func (*ClusterResourceSetBinding) Hub() {}

‎api/v1beta2/conversion.go

+6-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,9 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*Cluster) Hub() {}
20-
func (*ClusterList) Hub() {}
21-
func (*ClusterClass) Hub() {}
22-
func (*ClusterClassList) Hub() {}
23-
func (*Machine) Hub() {}
24-
func (*MachineList) Hub() {}
25-
func (*MachineSet) Hub() {}
26-
func (*MachineSetList) Hub() {}
27-
func (*MachineDeployment) Hub() {}
28-
func (*MachineDeploymentList) Hub() {}
29-
func (*MachineHealthCheck) Hub() {}
30-
func (*MachineHealthCheckList) Hub() {}
19+
func (*Cluster) Hub() {}
20+
func (*ClusterClass) Hub() {}
21+
func (*Machine) Hub() {}
22+
func (*MachineSet) Hub() {}
23+
func (*MachineDeployment) Hub() {}
24+
func (*MachineHealthCheck) Hub() {}

‎bootstrap/kubeadm/api/v1beta2/conversion.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*KubeadmConfig) Hub() {}
20-
func (*KubeadmConfigList) Hub() {}
21-
func (*KubeadmConfigTemplate) Hub() {}
22-
func (*KubeadmConfigTemplateList) Hub() {}
19+
func (*KubeadmConfig) Hub() {}
20+
func (*KubeadmConfigTemplate) Hub() {}
2321

2422
func (*ClusterConfiguration) Hub() {}
2523
func (*ClusterStatus) Hub() {}

‎controlplane/kubeadm/api/v1beta2/conversion.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*KubeadmControlPlane) Hub() {}
20-
func (*KubeadmControlPlaneList) Hub() {}
21-
func (*KubeadmControlPlaneTemplate) Hub() {}
22-
func (*KubeadmControlPlaneTemplateList) Hub() {}
19+
func (*KubeadmControlPlane) Hub() {}
20+
func (*KubeadmControlPlaneTemplate) Hub() {}

‎exp/api/v1beta2/conversion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*MachinePool) Hub() {}
20-
func (*MachinePoolList) Hub() {}
19+
func (*MachinePool) Hub() {}

‎exp/ipam/api/v1alpha1/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@ func (dst *IPAddress) ConvertFrom(srcRaw conversion.Hub) error {
3737
return Convert_v1beta2_IPAddress_To_v1alpha1_IPAddress(src, dst, nil)
3838
}
3939

40-
func (src *IPAddressList) ConvertTo(dstRaw conversion.Hub) error {
41-
dst := dstRaw.(*ipamv1.IPAddressList)
42-
43-
return Convert_v1alpha1_IPAddressList_To_v1beta2_IPAddressList(src, dst, nil)
44-
}
45-
46-
func (dst *IPAddressList) ConvertFrom(srcRaw conversion.Hub) error {
47-
src := srcRaw.(*ipamv1.IPAddressList)
48-
49-
return Convert_v1beta2_IPAddressList_To_v1alpha1_IPAddressList(src, dst, nil)
50-
}
51-
5240
func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
5341
dst := dstRaw.(*ipamv1.IPAddressClaim)
5442

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

110-
func (src *IPAddressClaimList) ConvertTo(dstRaw conversion.Hub) error {
111-
dst := dstRaw.(*ipamv1.IPAddressClaimList)
112-
113-
return Convert_v1alpha1_IPAddressClaimList_To_v1beta2_IPAddressClaimList(src, dst, nil)
114-
}
115-
116-
func (dst *IPAddressClaimList) ConvertFrom(srcRaw conversion.Hub) error {
117-
src := srcRaw.(*ipamv1.IPAddressClaimList)
118-
119-
return Convert_v1beta2_IPAddressClaimList_To_v1alpha1_IPAddressClaimList(src, dst, nil)
120-
}
121-
12298
func Convert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from *ipamv1.IPAddressClaimSpec, to *IPAddressClaimSpec, scope apiconversion.Scope) error {
12399
return autoConvert_v1beta2_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from, to, scope)
124100
}

‎exp/ipam/api/v1beta2/conversion.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
func (*IPAddress) Hub() {}
20-
func (*IPAddressList) Hub() {}
21-
func (*IPAddressClaim) Hub() {}
22-
func (*IPAddressClaimList) Hub() {}
19+
func (*IPAddress) Hub() {}
20+
func (*IPAddressClaim) Hub() {}

‎internal/apis/addons/v1alpha3/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@ func (dst *ClusterResourceSet) ConvertFrom(srcRaw conversion.Hub) error {
5353
return utilconversion.MarshalData(src, dst)
5454
}
5555

56-
func (src *ClusterResourceSetList) ConvertTo(dstRaw conversion.Hub) error {
57-
dst := dstRaw.(*addonsv1.ClusterResourceSetList)
58-
59-
return Convert_v1alpha3_ClusterResourceSetList_To_v1beta2_ClusterResourceSetList(src, dst, nil)
60-
}
61-
62-
func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
63-
src := srcRaw.(*addonsv1.ClusterResourceSetList)
64-
65-
return Convert_v1beta2_ClusterResourceSetList_To_v1alpha3_ClusterResourceSetList(src, dst, nil)
66-
}
67-
6856
func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
6957
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)
7058

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

98-
func (src *ClusterResourceSetBindingList) ConvertTo(dstRaw conversion.Hub) error {
99-
dst := dstRaw.(*addonsv1.ClusterResourceSetBindingList)
100-
101-
return Convert_v1alpha3_ClusterResourceSetBindingList_To_v1beta2_ClusterResourceSetBindingList(src, dst, nil)
102-
}
103-
104-
func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) error {
105-
src := srcRaw.(*addonsv1.ClusterResourceSetBindingList)
106-
107-
return Convert_v1beta2_ClusterResourceSetBindingList_To_v1alpha3_ClusterResourceSetBindingList(src, dst, nil)
108-
}
109-
11086
// Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec is a conversion function.
11187
func Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
11288
// Spec.ClusterName does not exist in ClusterResourceSetBinding v1alpha3 API.

‎internal/apis/addons/v1alpha4/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@ func (dst *ClusterResourceSet) ConvertFrom(srcRaw conversion.Hub) error {
5353
return utilconversion.MarshalData(src, dst)
5454
}
5555

56-
func (src *ClusterResourceSetList) ConvertTo(dstRaw conversion.Hub) error {
57-
dst := dstRaw.(*addonsv1.ClusterResourceSetList)
58-
59-
return Convert_v1alpha4_ClusterResourceSetList_To_v1beta2_ClusterResourceSetList(src, dst, nil)
60-
}
61-
62-
func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
63-
src := srcRaw.(*addonsv1.ClusterResourceSetList)
64-
65-
return Convert_v1beta2_ClusterResourceSetList_To_v1alpha4_ClusterResourceSetList(src, dst, nil)
66-
}
67-
6856
func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
6957
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)
7058

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

98-
func (src *ClusterResourceSetBindingList) ConvertTo(dstRaw conversion.Hub) error {
99-
dst := dstRaw.(*addonsv1.ClusterResourceSetBindingList)
100-
101-
return Convert_v1alpha4_ClusterResourceSetBindingList_To_v1beta2_ClusterResourceSetBindingList(src, dst, nil)
102-
}
103-
104-
func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) error {
105-
src := srcRaw.(*addonsv1.ClusterResourceSetBindingList)
106-
107-
return Convert_v1beta2_ClusterResourceSetBindingList_To_v1alpha4_ClusterResourceSetBindingList(src, dst, nil)
108-
}
109-
11086
// Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec is a conversion function.
11187
func Convert_v1beta2_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
11288
// Spec.ClusterName does not exist in ClusterResourceSetBinding v1alpha4 API.

‎internal/apis/bootstrap/kubeadm/v1alpha3/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,6 @@ func (dst *KubeadmConfig) ConvertFrom(srcRaw conversion.Hub) error {
127127
return nil
128128
}
129129

130-
func (src *KubeadmConfigList) ConvertTo(dstRaw conversion.Hub) error {
131-
dst := dstRaw.(*bootstrapv1.KubeadmConfigList)
132-
133-
return Convert_v1alpha3_KubeadmConfigList_To_v1beta2_KubeadmConfigList(src, dst, nil)
134-
}
135-
136-
func (dst *KubeadmConfigList) ConvertFrom(srcRaw conversion.Hub) error {
137-
src := srcRaw.(*bootstrapv1.KubeadmConfigList)
138-
139-
return Convert_v1beta2_KubeadmConfigList_To_v1alpha3_KubeadmConfigList(src, dst, nil)
140-
}
141-
142130
func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
143131
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplate)
144132

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

177-
func (src *KubeadmConfigTemplateList) ConvertTo(dstRaw conversion.Hub) error {
178-
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplateList)
179-
180-
return Convert_v1alpha3_KubeadmConfigTemplateList_To_v1beta2_KubeadmConfigTemplateList(src, dst, nil)
181-
}
182-
183-
func (dst *KubeadmConfigTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
184-
src := srcRaw.(*bootstrapv1.KubeadmConfigTemplateList)
185-
186-
return Convert_v1beta2_KubeadmConfigTemplateList_To_v1alpha3_KubeadmConfigTemplateList(src, dst, nil)
187-
}
188-
189165
func Convert_v1alpha3_KubeadmConfigStatus_To_v1beta2_KubeadmConfigStatus(in *KubeadmConfigStatus, out *bootstrapv1.KubeadmConfigStatus, s apiconversion.Scope) error {
190166
// KubeadmConfigStatus.BootstrapData has been removed in v1alpha4 because its content has been moved to the bootstrap data secret, value will be lost during conversion.
191167
return autoConvert_v1alpha3_KubeadmConfigStatus_To_v1beta2_KubeadmConfigStatus(in, out, s)

‎internal/apis/bootstrap/kubeadm/v1alpha4/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,6 @@ func (dst *KubeadmConfig) ConvertFrom(srcRaw conversion.Hub) error {
119119
return utilconversion.MarshalData(src, dst)
120120
}
121121

122-
func (src *KubeadmConfigList) ConvertTo(dstRaw conversion.Hub) error {
123-
dst := dstRaw.(*bootstrapv1.KubeadmConfigList)
124-
125-
return Convert_v1alpha4_KubeadmConfigList_To_v1beta2_KubeadmConfigList(src, dst, nil)
126-
}
127-
128-
func (dst *KubeadmConfigList) ConvertFrom(srcRaw conversion.Hub) error {
129-
src := srcRaw.(*bootstrapv1.KubeadmConfigList)
130-
131-
return Convert_v1beta2_KubeadmConfigList_To_v1alpha4_KubeadmConfigList(src, dst, nil)
132-
}
133-
134122
func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
135123
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplate)
136124

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

164-
func (src *KubeadmConfigTemplateList) ConvertTo(dstRaw conversion.Hub) error {
165-
dst := dstRaw.(*bootstrapv1.KubeadmConfigTemplateList)
166-
167-
return Convert_v1alpha4_KubeadmConfigTemplateList_To_v1beta2_KubeadmConfigTemplateList(src, dst, nil)
168-
}
169-
170-
func (dst *KubeadmConfigTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
171-
src := srcRaw.(*bootstrapv1.KubeadmConfigTemplateList)
172-
173-
return Convert_v1beta2_KubeadmConfigTemplateList_To_v1alpha4_KubeadmConfigTemplateList(src, dst, nil)
174-
}
175-
176152
// Convert_v1beta2_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec is an autogenerated conversion function.
177153
func Convert_v1beta2_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, out *KubeadmConfigSpec, s apiconversion.Scope) error {
178154
// KubeadmConfigSpec.Ignition does not exist in kubeadm v1alpha4 API.

‎internal/apis/controlplane/kubeadm/v1alpha3/conversion.go

-12
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,6 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
7979
return nil
8080
}
8181

82-
func (src *KubeadmControlPlaneList) ConvertTo(dstRaw conversion.Hub) error {
83-
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneList)
84-
85-
return Convert_v1alpha3_KubeadmControlPlaneList_To_v1beta2_KubeadmControlPlaneList(src, dst, nil)
86-
}
87-
88-
func (dst *KubeadmControlPlaneList) ConvertFrom(srcRaw conversion.Hub) error {
89-
src := srcRaw.(*controlplanev1.KubeadmControlPlaneList)
90-
91-
return Convert_v1beta2_KubeadmControlPlaneList_To_v1alpha3_KubeadmControlPlaneList(src, dst, nil)
92-
}
93-
9482
func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlaneSpec(in *controlplanev1.KubeadmControlPlaneSpec, out *KubeadmControlPlaneSpec, s apiconversion.Scope) error {
9583
out.UpgradeAfter = in.RolloutAfter
9684
out.InfrastructureTemplate = in.MachineTemplate.InfrastructureRef

‎internal/apis/controlplane/kubeadm/v1alpha4/conversion.go

-24
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,6 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
7474
return utilconversion.MarshalData(src, dst)
7575
}
7676

77-
func (src *KubeadmControlPlaneList) ConvertTo(dstRaw conversion.Hub) error {
78-
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneList)
79-
80-
return Convert_v1alpha4_KubeadmControlPlaneList_To_v1beta2_KubeadmControlPlaneList(src, dst, nil)
81-
}
82-
83-
func (dst *KubeadmControlPlaneList) ConvertFrom(srcRaw conversion.Hub) error {
84-
src := srcRaw.(*controlplanev1.KubeadmControlPlaneList)
85-
86-
return Convert_v1beta2_KubeadmControlPlaneList_To_v1alpha4_KubeadmControlPlaneList(src, dst, nil)
87-
}
88-
8977
func (src *KubeadmControlPlaneTemplate) ConvertTo(dstRaw conversion.Hub) error {
9078
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneTemplate)
9179

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

142-
func (src *KubeadmControlPlaneTemplateList) ConvertTo(dstRaw conversion.Hub) error {
143-
dst := dstRaw.(*controlplanev1.KubeadmControlPlaneTemplateList)
144-
145-
return Convert_v1alpha4_KubeadmControlPlaneTemplateList_To_v1beta2_KubeadmControlPlaneTemplateList(src, dst, nil)
146-
}
147-
148-
func (dst *KubeadmControlPlaneTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
149-
src := srcRaw.(*controlplanev1.KubeadmControlPlaneTemplateList)
150-
151-
return Convert_v1beta2_KubeadmControlPlaneTemplateList_To_v1alpha4_KubeadmControlPlaneTemplateList(src, dst, nil)
152-
}
153-
154130
func Convert_v1alpha4_KubeadmControlPlaneSpec_To_v1beta2_KubeadmControlPlaneTemplateResourceSpec(in *KubeadmControlPlaneSpec, out *controlplanev1.KubeadmControlPlaneTemplateResourceSpec, s apiconversion.Scope) error {
155131
out.MachineTemplate = &controlplanev1.KubeadmControlPlaneTemplateMachineTemplate{
156132
NodeDrainTimeout: in.MachineTemplate.NodeDrainTimeout,

‎internal/apis/core/exp/v1alpha3/conversion.go

-12
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,6 @@ func (dst *MachinePool) ConvertFrom(srcRaw conversion.Hub) error {
9090
return utilconversion.MarshalData(src, dst)
9191
}
9292

93-
func (src *MachinePoolList) ConvertTo(dstRaw conversion.Hub) error {
94-
dst := dstRaw.(*expv1.MachinePoolList)
95-
96-
return Convert_v1alpha3_MachinePoolList_To_v1beta2_MachinePoolList(src, dst, nil)
97-
}
98-
99-
func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error {
100-
src := srcRaw.(*expv1.MachinePoolList)
101-
102-
return Convert_v1beta2_MachinePoolList_To_v1alpha3_MachinePoolList(src, dst, nil)
103-
}
104-
10593
func Convert_v1alpha3_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in *clusterv1alpha3.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error {
10694
return clusterv1alpha3.Convert_v1alpha3_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in, out, s)
10795
}

‎internal/apis/core/exp/v1alpha4/conversion.go

-12
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,6 @@ func (dst *MachinePool) ConvertFrom(srcRaw conversion.Hub) error {
5555
return utilconversion.MarshalData(src, dst)
5656
}
5757

58-
func (src *MachinePoolList) ConvertTo(dstRaw conversion.Hub) error {
59-
dst := dstRaw.(*expv1.MachinePoolList)
60-
61-
return Convert_v1alpha4_MachinePoolList_To_v1beta2_MachinePoolList(src, dst, nil)
62-
}
63-
64-
func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error {
65-
src := srcRaw.(*expv1.MachinePoolList)
66-
67-
return Convert_v1beta2_MachinePoolList_To_v1alpha4_MachinePoolList(src, dst, nil)
68-
}
69-
7058
func Convert_v1alpha4_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in *clusterv1alpha4.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error {
7159
return clusterv1alpha4.Convert_v1alpha4_MachineTemplateSpec_To_v1beta2_MachineTemplateSpec(in, out, s)
7260
}

0 commit comments

Comments
 (0)