Skip to content

Commit 6b51a69

Browse files
akutzakutz
authored
Merge pull request #1305 from akutz/feature/move-enhanced-storage-api-fields
🌱 Promote storage APIs to spec.vol / Remove UnmanagedVolumeClaim
2 parents 702554a + 0927e53 commit 6b51a69

File tree

44 files changed

+1488
-2021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1488
-2021
lines changed

‎api/test/v1alpha1/virtualmachine_conversion_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,15 @@ func TestVirtualMachineConversion(t *testing.T) {
280280
PersistentVolumeClaimVolumeSource: corev1.PersistentVolumeClaimVolumeSource{
281281
ClaimName: "my-claim",
282282
},
283-
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
284-
ControllerType: vmopv1.VirtualControllerTypeSCSI,
285-
ControllerBusNumber: ptrOf(int32(0)),
286-
DiskMode: vmopv1.VolumeDiskModePersistent,
287-
UnitNumber: ptrOf(int32(0)),
288283
}),
289284
},
285+
ImageDiskName: "my-disk",
286+
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
287+
ControllerBusNumber: &[]int32{1}[0],
288+
ControllerType: vmopv1.VirtualControllerTypeSCSI,
289+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
290+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
291+
UnitNumber: &[]int32{2}[0],
290292
},
291293
{
292294
Name: "my-volume-2",

‎api/test/v1alpha2/virtualmachine_conversion_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,15 @@ func TestVirtualMachineConversion(t *testing.T) {
313313
PersistentVolumeClaimVolumeSource: corev1.PersistentVolumeClaimVolumeSource{
314314
ClaimName: "my-claim",
315315
},
316-
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
317-
ControllerType: vmopv1.VirtualControllerTypeSCSI,
318-
ControllerBusNumber: ptrOf(int32(0)),
319-
DiskMode: vmopv1.VolumeDiskModePersistent,
320-
UnitNumber: ptrOf(int32(0)),
321316
}),
322317
},
318+
ImageDiskName: "my-disk",
319+
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
320+
ControllerBusNumber: &[]int32{1}[0],
321+
ControllerType: vmopv1.VirtualControllerTypeSCSI,
322+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
323+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
324+
UnitNumber: &[]int32{2}[0],
323325
},
324326
{
325327
Name: "my-volume-2",

‎api/test/v1alpha3/virtualmachine_conversion_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,15 @@ func TestVirtualMachineConversion(t *testing.T) {
303303
PersistentVolumeClaimVolumeSource: corev1.PersistentVolumeClaimVolumeSource{
304304
ClaimName: "my-claim",
305305
},
306-
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
307-
ControllerType: vmopv1.VirtualControllerTypeSCSI,
308-
ControllerBusNumber: ptrOf(int32(0)),
309-
DiskMode: vmopv1.VolumeDiskModePersistent,
310-
UnitNumber: ptrOf(int32(0)),
311306
}),
312307
},
308+
ImageDiskName: "my-disk",
309+
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
310+
ControllerBusNumber: &[]int32{1}[0],
311+
ControllerType: vmopv1.VirtualControllerTypeSCSI,
312+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
313+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
314+
UnitNumber: &[]int32{2}[0],
313315
},
314316
{
315317
Name: "my-volume-2",

‎api/test/v1alpha4/virtualmachine_conversion_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,13 @@ func TestVirtualMachineConversion(t *testing.T) {
219219
},
220220
}),
221221
},
222+
ImageDiskName: "my-disk",
223+
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
224+
ControllerBusNumber: &[]int32{1}[0],
225+
ControllerType: vmopv1.VirtualControllerTypeSCSI,
226+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
227+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
228+
UnitNumber: &[]int32{2}[0],
222229
},
223230
{
224231
Name: "my-volume-2",

‎api/v1alpha1/virtualmachine_conversion.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,16 +1035,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
10351035
for i := range dst.Spec.Volumes {
10361036
dstVol := &dst.Spec.Volumes[i]
10371037
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
1038-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
1039-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
1040-
dstPvc.ApplicationType = srcPvc.ApplicationType
1041-
dstPvc.ControllerBusNumber = srcPvc.ControllerBusNumber
1042-
dstPvc.ControllerType = srcPvc.ControllerType
1043-
dstPvc.DiskMode = srcPvc.DiskMode
1044-
dstPvc.SharingMode = srcPvc.SharingMode
1045-
dstPvc.UnitNumber = srcPvc.UnitNumber
1046-
}
1047-
}
1038+
dstVol.ApplicationType = srcVol.ApplicationType
1039+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
1040+
dstVol.ControllerType = srcVol.ControllerType
1041+
dstVol.ImageDiskName = srcVol.ImageDiskName
1042+
dstVol.DiskMode = srcVol.DiskMode
1043+
dstVol.SharingMode = srcVol.SharingMode
1044+
dstVol.UnitNumber = srcVol.UnitNumber
10481045
}
10491046
}
10501047
}

‎api/v1alpha1/zz_generated.conversion.go‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha2/virtualmachine_conversion.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ import (
1515
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
1616
)
1717

18+
func Convert_v1alpha5_VirtualMachineVolume_To_v1alpha2_VirtualMachineVolume(
19+
in *vmopv1.VirtualMachineVolume, out *VirtualMachineVolume, s apiconversion.Scope) error {
20+
21+
return autoConvert_v1alpha5_VirtualMachineVolume_To_v1alpha2_VirtualMachineVolume(in, out, s)
22+
}
23+
1824
func Convert_v1alpha5_PersistentVolumeClaimVolumeSource_To_v1alpha2_PersistentVolumeClaimVolumeSource(
1925
in *vmopv1.PersistentVolumeClaimVolumeSource, out *PersistentVolumeClaimVolumeSource, s apiconversion.Scope) error {
2026

@@ -362,16 +368,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
362368
for i := range dst.Spec.Volumes {
363369
dstVol := &dst.Spec.Volumes[i]
364370
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
365-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
366-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
367-
dstPvc.ApplicationType = srcPvc.ApplicationType
368-
dstPvc.ControllerBusNumber = srcPvc.ControllerBusNumber
369-
dstPvc.ControllerType = srcPvc.ControllerType
370-
dstPvc.DiskMode = srcPvc.DiskMode
371-
dstPvc.SharingMode = srcPvc.SharingMode
372-
dstPvc.UnitNumber = srcPvc.UnitNumber
373-
}
374-
}
371+
dstVol.ApplicationType = srcVol.ApplicationType
372+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
373+
dstVol.ControllerType = srcVol.ControllerType
374+
dstVol.ImageDiskName = srcVol.ImageDiskName
375+
dstVol.DiskMode = srcVol.DiskMode
376+
dstVol.SharingMode = srcVol.SharingMode
377+
dstVol.UnitNumber = srcVol.UnitNumber
375378
}
376379
}
377380
}

‎api/v1alpha2/zz_generated.conversion.go‎

Lines changed: 12 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha3/virtualmachine_conversion.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ import (
1414
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
1515
)
1616

17+
func Convert_v1alpha5_VirtualMachineVolume_To_v1alpha3_VirtualMachineVolume(
18+
in *vmopv1.VirtualMachineVolume, out *VirtualMachineVolume, s apiconversion.Scope) error {
19+
20+
return autoConvert_v1alpha5_VirtualMachineVolume_To_v1alpha3_VirtualMachineVolume(in, out, s)
21+
}
22+
1723
func Convert_v1alpha5_VirtualMachineImageDiskInfo_To_v1alpha3_VirtualMachineImageDiskInfo(
1824
in *vmopv1.VirtualMachineImageDiskInfo, out *VirtualMachineImageDiskInfo, s apiconversion.Scope) error {
1925

@@ -234,16 +240,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
234240
for i := range dst.Spec.Volumes {
235241
dstVol := &dst.Spec.Volumes[i]
236242
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
237-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
238-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
239-
dstPvc.ApplicationType = srcPvc.ApplicationType
240-
dstPvc.ControllerBusNumber = srcPvc.ControllerBusNumber
241-
dstPvc.ControllerType = srcPvc.ControllerType
242-
dstPvc.DiskMode = srcPvc.DiskMode
243-
dstPvc.SharingMode = srcPvc.SharingMode
244-
dstPvc.UnitNumber = srcPvc.UnitNumber
245-
}
246-
}
243+
dstVol.ApplicationType = srcVol.ApplicationType
244+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
245+
dstVol.ControllerType = srcVol.ControllerType
246+
dstVol.ImageDiskName = srcVol.ImageDiskName
247+
dstVol.DiskMode = srcVol.DiskMode
248+
dstVol.SharingMode = srcVol.SharingMode
249+
dstVol.UnitNumber = srcVol.UnitNumber
247250
}
248251
}
249252
}

‎api/v1alpha3/zz_generated.conversion.go‎

Lines changed: 12 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)