Added multi disk support

Author: vr4manta

apis/v1alpha3/zz_generated.conversion.go

@@ -203,6 +203,21 @@ type VirtualMachineCloneSpec struct {
 	// Check the compatibility with the ESXi version before setting the value.
 	// +optional
 	HardwareVersion string `json:"hardwareVersion,omitempty"`
+	// DataDisks holds information for additional disks to add to the VM that are not part of the VM's OVA template.
+	// +optional
+	DataDisks []VSphereDisk `json:"dataDisks,omitempty"`
+}
+
+// VSphereDisk describes additional disks for vSphere to be added to VM that are not part of the VM OVA template.
+type VSphereDisk struct {
+	// DeviceName is a name to be used to identify the disk definition. If deviceName is not specified,
+	// the disk will still be created.  The deviceName should be unique so that it can be used to clearly
+	// identify purpose of the disk, but is not required to be unique.
+	// +optional
+	DeviceName string `json:"deviceName,omitempty"`
+	// SizeGiB is the size of the disk (in GiB).
+	// +kubebuilder:validation:Required
+	SizeGiB int64 `json:"sizeGiB"`
 }
 
 // VSphereMachineTemplateResource describes the data needed to create a VSphereMachine from a template.

apis/v1alpha4/zz_generated.conversion.go

@@ -988,6 +988,27 @@ spec:
                   CustomVMXKeys is a dictionary of advanced VMX options that can be set on VM
                   Defaults to empty map
                 type: object
+              dataDisks:
+                description: DataDisks holds information for additional disks to add
+                  to the VM that are not part of the VM's OVA template.
+                items:
+                  description: VSphereDisk describes additional disks for vSphere
+                    to be added to VM that are not part of the VM OVA template.
+                  properties:
+                    deviceName:
+                      description: |-
+                        DeviceName is a name to be used to identify the disk definition. If deviceName is not specified,
+                        the disk will still be created.  The deviceName should be unique so that it can be used to clearly
+                        identify purpose of the disk, but is not required to be unique.
+                      type: string
+                    sizeGiB:
+                      description: SizeGiB is the size of the disk (in GiB).
+                      format: int64
+                      type: integer
+                  required:
+                  - sizeGiB
+                  type: object
+                type: array
               datacenter:
                 description: |-
                   Datacenter is the name or inventory path of the datacenter in which the

apis/v1beta1/types.go

@@ -857,6 +857,28 @@ spec:
                           CustomVMXKeys is a dictionary of advanced VMX options that can be set on VM
                           Defaults to empty map
                         type: object
+                      dataDisks:
+                        description: DataDisks holds information for additional disks
+                          to add to the VM that are not part of the VM's OVA template.
+                        items:
+                          description: VSphereDisk describes additional disks for
+                            vSphere to be added to VM that are not part of the VM
+                            OVA template.
+                          properties:
+                            deviceName:
+                              description: |-
+                                DeviceName is a name to be used to identify the disk definition. If deviceName is not specified,
+                                the disk will still be created.  The deviceName should be unique so that it can be used to clearly
+                                identify purpose of the disk, but is not required to be unique.
+                              type: string
+                            sizeGiB:
+                              description: SizeGiB is the size of the disk (in GiB).
+                              format: int64
+                              type: integer
+                          required:
+                          - sizeGiB
+                          type: object
+                        type: array
                       datacenter:
                         description: |-
                           Datacenter is the name or inventory path of the datacenter in which the

apis/v1beta1/zz_generated.deepcopy.go

@@ -1081,6 +1081,27 @@ spec:
                   CustomVMXKeys is a dictionary of advanced VMX options that can be set on VM
                   Defaults to empty map
                 type: object
+              dataDisks:
+                description: DataDisks holds information for additional disks to add
+                  to the VM that are not part of the VM's OVA template.
+                items:
+                  description: VSphereDisk describes additional disks for vSphere
+                    to be added to VM that are not part of the VM OVA template.
+                  properties:
+                    deviceName:
+                      description: |-
+                        DeviceName is a name to be used to identify the disk definition. If deviceName is not specified,
+                        the disk will still be created.  The deviceName should be unique so that it can be used to clearly
+                        identify purpose of the disk, but is not required to be unique.
+                      type: string
+                    sizeGiB:
+                      description: SizeGiB is the size of the disk (in GiB).
+                      format: int64
+                      type: integer
+                  required:
+                  - sizeGiB
+                  type: object
+                type: array
               datacenter:
                 description: |-
                   Datacenter is the name or inventory path of the datacenter in which the

config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml

@@ -29,6 +29,7 @@ import (
 	pbmTypes "github.com/vmware/govmomi/pbm/types"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -369,6 +370,49 @@ func getDiskSpec(vmCtx *capvcontext.VMContext, devices object.VirtualDeviceList)
 			diskSpecs = append(diskSpecs, additionalDiskConfigSpec)
 		}
 	}
+
+	// Now if we have increased the disk size of any additional disks that were in the template, we can now add new disks
+	// that are present in the additionalDisks list.
+	for i, dataDisk := range vmCtx.VSphereVM.Spec.DataDisks {
+		klog.InfoS("Adding disk", "spec", dataDisk)
+
+		// Need storage policy
+		// Need scsi controller
+		controller, err := devices.FindDiskController("scsi")
+		if err != nil {
+			klog.Infof("Unable to get scsi controller")
+		}
+
+		unit := int32(i + 1)
+
+		dev := &types.VirtualDisk{
+			VirtualDevice: types.VirtualDevice{
+				Key: devices.NewKey() - int32(i),
+				Backing: &types.VirtualDiskFlatVer2BackingInfo{
+					DiskMode:        string(types.VirtualDiskModePersistent),
+					ThinProvisioned: types.NewBool(true),
+					VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+						FileName: "",
+						//Datastore: types.NewReference(datastore.Reference()),
+					},
+				},
+				UnitNumber:    &unit,
+				ControllerKey: controller.GetVirtualController().Key,
+			},
+			CapacityInKB: dataDisk.SizeGiB * 1024 * 1024,
+		}
+
+		diskConfigSpec := types.VirtualDeviceConfigSpec{
+			Device:        dev,
+			Operation:     types.VirtualDeviceConfigSpecOperationAdd,
+			FileOperation: types.VirtualDeviceConfigSpecFileOperationCreate,
+		}
+
+		klog.InfoS("Generated device", "dev", dev)
+
+		diskSpecs = append(diskSpecs, &diskConfigSpec)
+	}
+
 	return diskSpecs, nil
 }