Skip to content

Commit 974effe

Browse files
fixes
1 parent cb67516 commit 974effe

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

api/v1beta2/cloudstackmachine_conversion.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ limitations under the License.
1717
package v1beta2
1818

1919
import (
20-
machineryconversion "k8s.io/apimachinery/pkg/conversion"
2120
"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
2221
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2322
"sigs.k8s.io/controller-runtime/pkg/conversion"
2423
)
2524

2625
func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
2726
dst := dstRaw.(*v1beta3.CloudStackMachine)
28-
if err := Convert_v1beta2_CloudStackMachine_To_v1beta3_CloudStackMachine(src, dst, nil); err != nil {
27+
if err := Convert_v1beta2_CloudStackMachine_To_v1beta3_CloudStackMachine(src, dst, nil); err != nil {
2928
return err
3029
}
3130

@@ -44,18 +43,11 @@ func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
4443

4544
func (dst *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error { // nolint
4645
src := srcRaw.(*v1beta3.CloudStackMachine)
47-
if err := Convert_v1beta3_CloudStackMachine_To_v1beta2_CloudStackMachine(src, dst, nil); err != nil {
46+
if err := Convert_v1beta3_CloudStackMachine_To_v1beta2_CloudStackMachine(src, dst, nil); err != nil {
4847
return err
4948
}
5049

5150
// Preserve Hub data on down-conversion, including Networks field
5251
err := utilconversion.MarshalData(src, dst)
5352
return err
5453
}
55-
56-
// Convert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec handles the conversion from v1beta3 to v1beta2,
57-
// ignoring the Networks field that doesn't exist in v1beta2
58-
func Convert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in *v1beta3.CloudStackMachineSpec, out *CloudStackMachineSpec, s machineryconversion.Scope) error { // nolint
59-
// Use the auto-generated conversion function, which will handle all fields except Networks
60-
return autoConvert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in, out, s)
61-
}

0 commit comments

Comments
 (0)