Add vSphere multi disk support

openshift · Oct 9, 2024 · 981dd64 · 981dd64
1 parent 112d87a
commit 981dd64
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/machine/v1beta1/types_vsphereprovider.go b/machine/v1beta1/types_vsphereprovider.go
@@ -75,7 +75,7 @@ type VSphereMachineProviderSpec struct {
 	// The first disk on that SCSI controller will be the OS disk from the template.
 	// +openshift:enable:FeatureGate=VSphereMultiDisk
 	// +optional
-	Disks []VSphereDisk `json:"disks,omitempty"`
+	DataDisks []VSphereDisk `json:"dataDisks,omitempty"`
 }
 
 // CloneMode is the type of clone operation used to clone a VM from a template.

diff --git a/machine/v1beta1/zz_generated.deepcopy.go b/machine/v1beta1/zz_generated.deepcopy.go
diff --git a/machine/v1beta1/zz_generated.swagger_doc_generated.go b/machine/v1beta1/zz_generated.swagger_doc_generated.go
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -22277,19 +22277,19 @@
           "description": "CredentialsSecret is a reference to the secret with vSphere credentials.",
           "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference"
         },
-        "diskGiB": {
-          "description": "DiskGiB is the size of a virtual machine's disk, in GiB. Defaults to the analogue property value in the template from which this machine is cloned. This parameter will be ignored if 'LinkedClone' CloneMode is set.",
-          "type": "integer",
-          "format": "int32"
-        },
-        "disks": {
+        "dataDisks": {
           "description": "disks is a list of non OS disks to be created and attached to the VM.  The max number of disk allowed to be attached is currently 15.  This limitation is being applied to allow no more than 16 disks on the default scsi controller for the VM. The first disk on that SCSI controller will be the OS disk from the template.",
           "type": "array",
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.VSphereDisk"
           }
         },
+        "diskGiB": {
+          "description": "DiskGiB is the size of a virtual machine's disk, in GiB. Defaults to the analogue property value in the template from which this machine is cloned. This parameter will be ignored if 'LinkedClone' CloneMode is set.",
+          "type": "integer",
+          "format": "int32"
+        },
         "kind": {
           "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
           "type": "string"