Skip to content

Commit 7e52b76

Browse files
bryanvbryanv
committed
Add missing v1a6 version conversion bits
Add stuff that the old new-schema-version.py missed when a type was just added in the now prior Hub version. While here, also add conversion for VirtualMachineClassInstance since that wasn't done between v1a4 and v1a5.
1 parent 5578bda commit 7e52b76

9 files changed

+214
-11
lines changed

‎api/v1alpha4/virtualmachineclassinstance_conversion.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha4
6+
7+
import (
8+
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
9+
10+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
11+
)
12+
13+
// ConvertTo converts this VirtualMachineClassInstance to the Hub version.
14+
func (src *VirtualMachineClassInstance) ConvertTo(dstRaw ctrlconversion.Hub) error {
15+
dst := dstRaw.(*vmopv1.VirtualMachineClassInstance)
16+
return Convert_v1alpha4_VirtualMachineClassInstance_To_v1alpha6_VirtualMachineClassInstance(src, dst, nil)
17+
}
18+
19+
// ConvertFrom converts the hub version to this VirtualMachineClassInstance.
20+
func (dst *VirtualMachineClassInstance) ConvertFrom(srcRaw ctrlconversion.Hub) error {
21+
src := srcRaw.(*vmopv1.VirtualMachineClassInstance)
22+
return Convert_v1alpha6_VirtualMachineClassInstance_To_v1alpha4_VirtualMachineClassInstance(src, dst, nil)
23+
}

‎api/v1alpha5/virtualmachineclassinstance_conversion.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha5
6+
7+
import (
8+
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
9+
10+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
11+
)
12+
13+
// ConvertTo converts this VirtualMachineClassInstance to the Hub version.
14+
func (src *VirtualMachineClassInstance) ConvertTo(dstRaw ctrlconversion.Hub) error {
15+
dst := dstRaw.(*vmopv1.VirtualMachineClassInstance)
16+
return Convert_v1alpha5_VirtualMachineClassInstance_To_v1alpha6_VirtualMachineClassInstance(src, dst, nil)
17+
}
18+
19+
// ConvertFrom converts the hub version to this VirtualMachineClassInstance.
20+
func (dst *VirtualMachineClassInstance) ConvertFrom(srcRaw ctrlconversion.Hub) error {
21+
src := srcRaw.(*vmopv1.VirtualMachineClassInstance)
22+
return Convert_v1alpha6_VirtualMachineClassInstance_To_v1alpha5_VirtualMachineClassInstance(src, dst, nil)
23+
}
24+
25+
// ConvertTo converts this VirtualMachineClassInstanceList to the Hub version.
26+
func (src *VirtualMachineClassInstanceList) ConvertTo(dstRaw ctrlconversion.Hub) error {
27+
dst := dstRaw.(*vmopv1.VirtualMachineClassInstanceList)
28+
return Convert_v1alpha5_VirtualMachineClassInstanceList_To_v1alpha6_VirtualMachineClassInstanceList(src, dst, nil)
29+
}
30+
31+
// ConvertFrom converts the hub version to this VirtualMachineClassInstanceList.
32+
func (dst *VirtualMachineClassInstanceList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
33+
src := srcRaw.(*vmopv1.VirtualMachineClassInstanceList)
34+
return Convert_v1alpha6_VirtualMachineClassInstanceList_To_v1alpha5_VirtualMachineClassInstanceList(src, dst, nil)
35+
}

‎api/v1alpha5/virtualmachinegroup_publishrequest_conversion.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha5
6+
7+
import (
8+
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
9+
10+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
11+
)
12+
13+
// ConvertTo converts this VirtualMachineGroupPublishRequest to the Hub version.
14+
func (src *VirtualMachineGroupPublishRequest) ConvertTo(dstRaw ctrlconversion.Hub) error {
15+
dst := dstRaw.(*vmopv1.VirtualMachineGroupPublishRequest)
16+
return Convert_v1alpha5_VirtualMachineGroupPublishRequest_To_v1alpha6_VirtualMachineGroupPublishRequest(src, dst, nil)
17+
}
18+
19+
// ConvertFrom converts the hub version to this VirtualMachineGroupPublishRequest.
20+
func (dst *VirtualMachineGroupPublishRequest) ConvertFrom(srcRaw ctrlconversion.Hub) error {
21+
src := srcRaw.(*vmopv1.VirtualMachineGroupPublishRequest)
22+
return Convert_v1alpha6_VirtualMachineGroupPublishRequest_To_v1alpha5_VirtualMachineGroupPublishRequest(src, dst, nil)
23+
}
24+
25+
// ConvertTo converts this VirtualMachineGroupPublishRequestList to the Hub version.
26+
func (src *VirtualMachineGroupPublishRequestList) ConvertTo(dstRaw ctrlconversion.Hub) error {
27+
dst := dstRaw.(*vmopv1.VirtualMachineGroupPublishRequestList)
28+
return Convert_v1alpha5_VirtualMachineGroupPublishRequestList_To_v1alpha6_VirtualMachineGroupPublishRequestList(src, dst, nil)
29+
}
30+
31+
// ConvertFrom converts the hub version to this VirtualMachineGroupPublishRequestList.
32+
func (dst *VirtualMachineGroupPublishRequestList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
33+
src := srcRaw.(*vmopv1.VirtualMachineGroupPublishRequestList)
34+
return Convert_v1alpha6_VirtualMachineGroupPublishRequestList_To_v1alpha5_VirtualMachineGroupPublishRequestList(src, dst, nil)
35+
}

‎api/v1alpha5/virtualmachinesnapshot_conversion.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha5
6+
7+
import (
8+
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
9+
10+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
11+
)
12+
13+
// ConvertTo converts this VirtualMachineSnapshot to the Hub version.
14+
func (src *VirtualMachineSnapshot) ConvertTo(dstRaw ctrlconversion.Hub) error {
15+
dst := dstRaw.(*vmopv1.VirtualMachineSnapshot)
16+
return Convert_v1alpha5_VirtualMachineSnapshot_To_v1alpha6_VirtualMachineSnapshot(src, dst, nil)
17+
}
18+
19+
// ConvertFrom converts the hub version to this VirtualMachineSnapshot.
20+
func (dst *VirtualMachineSnapshot) ConvertFrom(srcRaw ctrlconversion.Hub) error {
21+
src := srcRaw.(*vmopv1.VirtualMachineSnapshot)
22+
return Convert_v1alpha6_VirtualMachineSnapshot_To_v1alpha5_VirtualMachineSnapshot(src, dst, nil)
23+
}
24+
25+
// ConvertTo converts this VirtualMachineSnapshotList to the Hub version.
26+
func (src *VirtualMachineSnapshotList) ConvertTo(dstRaw ctrlconversion.Hub) error {
27+
dst := dstRaw.(*vmopv1.VirtualMachineSnapshotList)
28+
return Convert_v1alpha5_VirtualMachineSnapshotList_To_v1alpha6_VirtualMachineSnapshotList(src, dst, nil)
29+
}
30+
31+
// ConvertFrom converts the hub version to this VirtualMachineSnapshotList.
32+
func (dst *VirtualMachineSnapshotList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
33+
src := srcRaw.(*vmopv1.VirtualMachineSnapshotList)
34+
return Convert_v1alpha6_VirtualMachineSnapshotList_To_v1alpha5_VirtualMachineSnapshotList(src, dst, nil)
35+
}

‎api/v1alpha6/virtualmachineclassinstance_conversion.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha6
6+
7+
// Hub marks VirtualMachineClassInstance as a conversion hub.
8+
func (*VirtualMachineClassInstance) Hub() {}
9+
10+
// Hub marks VirtualMachineClassInstanceList as a conversion hub.
11+
func (*VirtualMachineClassInstanceList) Hub() {}

‎api/v1alpha6/virtualmachinegroup_publishrequest_conversion.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha6
6+
7+
// Hub marks VirtualMachineGroupPublishRequest as a conversion hub.
8+
func (*VirtualMachineGroupPublishRequest) Hub() {}
9+
10+
// Hub marks VirtualMachineGroupPublishRequestList as a conversion hub.
11+
func (*VirtualMachineGroupPublishRequestList) Hub() {}

‎api/v1alpha6/virtualmachinesnapshot_conversion.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// © Broadcom. All Rights Reserved.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
4+
5+
package v1alpha6
6+
7+
// Hub marks VirtualMachineSnapshot as a conversion hub.
8+
func (*VirtualMachineSnapshot) Hub() {}
9+
10+
// Hub marks VirtualMachineSnapshotList as a conversion hub.
11+
func (*VirtualMachineSnapshotList) Hub() {}

‎webhooks/conversion/v1alpha4/webhooks.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ func AddToManager(ctx *pkgctx.ControllerManagerContext, mgr ctrlmgr.Manager) err
2828
return err
2929
}
3030

31+
if err := ctrl.NewWebhookManagedBy(mgr).
32+
For(&vmopv1a4.VirtualMachineClassInstance{}).
33+
Complete(); err != nil {
34+
35+
return err
36+
}
37+
3138
if err := ctrl.NewWebhookManagedBy(mgr).
3239
For(&vmopv1a4.VirtualMachineImage{}).
3340
Complete(); err != nil {

‎webhooks/conversion/v1alpha5/webhooks.go‎

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// © Broadcom. All Rights Reserved.
2-
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
2+
// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
33
// SPDX-License-Identifier: Apache-2.0
44

55
package v1alpha5
@@ -8,70 +8,105 @@ import (
88
ctrl "sigs.k8s.io/controller-runtime"
99
ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
1010

11-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
11+
vmopv1a5 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
1212
pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
1313
)
1414

1515
func AddToManager(ctx *pkgctx.ControllerManagerContext, mgr ctrlmgr.Manager) error {
1616

1717
if err := ctrl.NewWebhookManagedBy(mgr).
18-
For(&vmopv1.VirtualMachine{}).
18+
For(&vmopv1a5.ClusterVirtualMachineImage{}).
1919
Complete(); err != nil {
2020

2121
return err
2222
}
2323

2424
if err := ctrl.NewWebhookManagedBy(mgr).
25-
For(&vmopv1.VirtualMachineClass{}).
25+
For(&vmopv1a5.VirtualMachine{}).
2626
Complete(); err != nil {
2727

2828
return err
2929
}
3030

3131
if err := ctrl.NewWebhookManagedBy(mgr).
32-
For(&vmopv1.VirtualMachineImage{}).
32+
For(&vmopv1a5.VirtualMachineClass{}).
3333
Complete(); err != nil {
3434

3535
return err
3636
}
3737

3838
if err := ctrl.NewWebhookManagedBy(mgr).
39-
For(&vmopv1.ClusterVirtualMachineImage{}).
39+
For(&vmopv1a5.VirtualMachineClassInstance{}).
4040
Complete(); err != nil {
4141

4242
return err
4343
}
4444

4545
if err := ctrl.NewWebhookManagedBy(mgr).
46-
For(&vmopv1.VirtualMachineImageCache{}).
46+
For(&vmopv1a5.VirtualMachineGroup{}).
4747
Complete(); err != nil {
4848

4949
return err
5050
}
5151

5252
if err := ctrl.NewWebhookManagedBy(mgr).
53-
For(&vmopv1.VirtualMachinePublishRequest{}).
53+
For(&vmopv1a5.VirtualMachineGroupPublishRequest{}).
5454
Complete(); err != nil {
5555

5656
return err
5757
}
5858

5959
if err := ctrl.NewWebhookManagedBy(mgr).
60-
For(&vmopv1.VirtualMachineService{}).
60+
For(&vmopv1a5.VirtualMachineImage{}).
6161
Complete(); err != nil {
6262

6363
return err
6464
}
6565

6666
if err := ctrl.NewWebhookManagedBy(mgr).
67-
For(&vmopv1.VirtualMachineSetResourcePolicy{}).
67+
For(&vmopv1a5.VirtualMachineImageCache{}).
6868
Complete(); err != nil {
6969

7070
return err
7171
}
7272

7373
if err := ctrl.NewWebhookManagedBy(mgr).
74-
For(&vmopv1.VirtualMachineWebConsoleRequest{}).
74+
For(&vmopv1a5.VirtualMachinePublishRequest{}).
75+
Complete(); err != nil {
76+
77+
return err
78+
}
79+
80+
if err := ctrl.NewWebhookManagedBy(mgr).
81+
For(&vmopv1a5.VirtualMachineReplicaSet{}).
82+
Complete(); err != nil {
83+
84+
return err
85+
}
86+
87+
if err := ctrl.NewWebhookManagedBy(mgr).
88+
For(&vmopv1a5.VirtualMachineService{}).
89+
Complete(); err != nil {
90+
91+
return err
92+
}
93+
94+
if err := ctrl.NewWebhookManagedBy(mgr).
95+
For(&vmopv1a5.VirtualMachineSetResourcePolicy{}).
96+
Complete(); err != nil {
97+
98+
return err
99+
}
100+
101+
if err := ctrl.NewWebhookManagedBy(mgr).
102+
For(&vmopv1a5.VirtualMachineSnapshot{}).
103+
Complete(); err != nil {
104+
105+
return err
106+
}
107+
108+
if err := ctrl.NewWebhookManagedBy(mgr).
109+
For(&vmopv1a5.VirtualMachineWebConsoleRequest{}).
75110
Complete(); err != nil {
76111

77112
return err

0 commit comments

Comments
 (0)