Merge pull request #1266 from nutanix-cloud-native/nutanix-gpu-datadisks

CORS-3546: Nutanix: add gpus and dataDisks support

Author: openshift-merge-bot[bot]

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
-	github.com/openshift/api v0.0.0-20240708071937-c9a91940bf0f
+	github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215
 	github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
 	github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -476,8 +476,8 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8
 github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
 github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
-github.com/openshift/api v0.0.0-20240708071937-c9a91940bf0f h1:NmJAlN2fPnL86aq5BbEQJ62v/D16LzIaaQ0Qn72s87E=
-github.com/openshift/api v0.0.0-20240708071937-c9a91940bf0f/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215 h1:NY9X6aNRa3PKTRj9nTncCoGRbdwiis2CL1T3miXxjoc=
+github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
 github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c h1:gLylEQQryG+A6nqWYIwE1wUzn1eFUmthjADvflMWKnM=

pkg/webhooks/machine_webhook.go

@@ -1665,12 +1665,124 @@ func validateNutanix(m *machinev1beta1.Machine, config *admissionConfig) (bool,
 		}
 	}
 
+	// validate gpus if configured
+	if len(providerSpec.GPUs) > 0 {
+		fldPath := field.NewPath("providerSpec", "gpus")
+		for _, gpu := range providerSpec.GPUs {
+			switch gpu.Type {
+			case machinev1.NutanixGPUIdentifierDeviceID:
+				if gpu.DeviceID == nil {
+					errs = append(errs, field.Required(fldPath.Child("deviceID"), "missing gpu deviceID"))
+				}
+			case machinev1.NutanixGPUIdentifierName:
+				if gpu.Name == nil || *gpu.Name == "" {
+					errs = append(errs, field.Required(fldPath.Child("name"), "missing gpu name"))
+				}
+			default:
+				errMsg := fmt.Sprintf("invalid gpu identifier type, the valid types: %q, %q.", machinev1.NutanixGPUIdentifierDeviceID, machinev1.NutanixGPUIdentifierName)
+				errs = append(errs, field.Invalid(fldPath.Child("type"), gpu.Type, errMsg))
+			}
+		}
+	}
+
+	// validate dataDisks if configured
+	if len(providerSpec.DataDisks) > 0 {
+		for _, fldErr := range validateNutanixDataDisks(providerSpec.DataDisks) {
+			errs = append(errs, fldErr)
+		}
+	}
+
 	if len(errs) > 0 {
 		return false, warnings, errs
 	}
 	return true, warnings, nil
 }
 
+func validateNutanixDataDisks(disks []machinev1.NutanixVMDisk) (fldErrs []*field.Error) {
+	fldPath := field.NewPath("providerSpec", "dataDisks")
+	var errMsg string
+
+	for _, disk := range disks {
+		// validate the minimum diskSize of 1Gi
+		diskSizeBytes := disk.DiskSize.Value()
+		if diskSizeBytes < 1024*1024*1024 {
+			fldErrs = append(fldErrs, field.Invalid(fldPath.Child("diskSize"), fmt.Sprintf("%v bytes", diskSizeBytes), "The minimum diskSize is 1Gi bytes."))
+		}
+
+		if disk.DeviceProperties != nil {
+			switch disk.DeviceProperties.DeviceType {
+			case machinev1.NutanixDiskDeviceTypeDisk:
+				switch disk.DeviceProperties.AdapterType {
+				case machinev1.NutanixDiskAdapterTypeSCSI, machinev1.NutanixDiskAdapterTypeIDE, machinev1.NutanixDiskAdapterTypePCI, machinev1.NutanixDiskAdapterTypeSATA, machinev1.NutanixDiskAdapterTypeSPAPR:
+					// valid configuration
+				default:
+					// invalid configuration
+					fldErrs = append(fldErrs, field.Invalid(fldPath.Child("deviceProperties", "adapterType"), disk.DeviceProperties.AdapterType,
+						fmt.Sprintf("invalid adapter type for the %q device type, the valid values: %q, %q, %q, %q, %q.",
+							machinev1.NutanixDiskDeviceTypeDisk, machinev1.NutanixDiskAdapterTypeSCSI, machinev1.NutanixDiskAdapterTypeIDE,
+							machinev1.NutanixDiskAdapterTypePCI, machinev1.NutanixDiskAdapterTypeSATA, machinev1.NutanixDiskAdapterTypeSPAPR)))
+				}
+			case machinev1.NutanixDiskDeviceTypeCDROM:
+				switch disk.DeviceProperties.AdapterType {
+				case machinev1.NutanixDiskAdapterTypeIDE, machinev1.NutanixDiskAdapterTypeSATA:
+					// valid configuration
+				default:
+					// invalid configuration
+					fldErrs = append(fldErrs, field.Invalid(fldPath.Child("deviceProperties", "adapterType"), disk.DeviceProperties.AdapterType,
+						fmt.Sprintf("invalid adapter type for the %q device type, the valid values: %q, %q.",
+							machinev1.NutanixDiskDeviceTypeCDROM, machinev1.NutanixDiskAdapterTypeIDE, machinev1.NutanixDiskAdapterTypeSATA)))
+				}
+			default:
+				fldErrs = append(fldErrs, field.Invalid(fldPath.Child("deviceProperties", "deviceType"), disk.DeviceProperties.DeviceType,
+					fmt.Sprintf("invalid device type, the valid types: %q, %q.", machinev1.NutanixDiskDeviceTypeDisk, machinev1.NutanixDiskDeviceTypeCDROM)))
+			}
+
+			if disk.DeviceProperties.DeviceIndex < 0 {
+				fldErrs = append(fldErrs, field.Invalid(fldPath.Child("deviceProperties", "deviceIndex"),
+					disk.DeviceProperties.DeviceIndex, "invalid device index, the valid values are non-negative integers."))
+			}
+		}
+
+		if disk.StorageConfig != nil {
+			if disk.StorageConfig.DiskMode != machinev1.NutanixDiskModeStandard && disk.StorageConfig.DiskMode != machinev1.NutanixDiskModeFlash {
+				fldErrs = append(fldErrs, field.Invalid(fldPath.Child("storageConfig", "diskMode"), disk.StorageConfig.DiskMode,
+					fmt.Sprintf("invalid disk mode, the valid values: %q, %q.", machinev1.NutanixDiskModeStandard, machinev1.NutanixDiskModeFlash)))
+			}
+
+			storageContainerRef := disk.StorageConfig.StorageContainer
+			if storageContainerRef != nil {
+				switch storageContainerRef.Type {
+				case machinev1.NutanixIdentifierUUID:
+					if storageContainerRef.UUID == nil || *storageContainerRef.UUID == "" {
+						fldErrs = append(fldErrs, field.Required(fldPath.Child("storageConfig", "storageContainer", "uuid"), "missing storageContainer uuid."))
+					}
+				default:
+					errMsg = fmt.Sprintf("invalid storageContainer reference type, the valid values: %q.", machinev1.NutanixIdentifierUUID)
+					fldErrs = append(fldErrs, field.Invalid(fldPath.Child("storageConfig", "storageContainer", "type"), storageContainerRef.Type, errMsg))
+				}
+			}
+		}
+
+		if disk.DataSource != nil {
+			switch disk.DataSource.Type {
+			case machinev1.NutanixIdentifierUUID:
+				if disk.DataSource.UUID == nil || *disk.DataSource.UUID == "" {
+					fldErrs = append(fldErrs, field.Required(fldPath.Child("dataSource", "uuid"), "missing disk dataSource uuid."))
+				}
+			case machinev1.NutanixIdentifierName:
+				if disk.DataSource.Name == nil || *disk.DataSource.Name == "" {
+					fldErrs = append(fldErrs, field.Required(fldPath.Child("dataSource", "name"), "missing disk dataSource name."))
+				}
+			default:
+				errMsg := fmt.Sprintf("invalid disk dataSource reference type, the valid values: %q, %q.", machinev1.NutanixIdentifierUUID, machinev1.NutanixIdentifierName)
+				fldErrs = append(fldErrs, field.Invalid(fldPath.Child("dataSource", "type"), disk.DataSource.Type, errMsg))
+			}
+		}
+	}
+
+	return fldErrs
+}
+
 func validateNutanixResourceIdentifier(resource string, identifier machinev1.NutanixResourceIdentifier) *field.Error {
 	parentPath := field.NewPath("providerSpec")
 	if identifier.Type == machinev1.NutanixIdentifierName {

pkg/webhooks/machine_webhook_test.go

@@ -5058,6 +5058,22 @@ func TestValidateNutanixProviderSpec(t *testing.T) {
 			expectedOk:    false,
 			expectedError: "providerSpec.categories.value: Invalid value: \"val0123456789012345678901234567890123456789012345678901234567890123456789\": value must be a string with length between 1 and 64.",
 		},
+		{
+			testCase: "with invalid gpu reference type provided",
+			modifySpec: func(p *machinev1.NutanixMachineProviderConfig) {
+				p.GPUs = append(p.GPUs, machinev1.NutanixGPU{Type: "invalid"})
+			},
+			expectedOk:    false,
+			expectedError: "providerSpec.gpus.type: Invalid value: \"invalid\": invalid gpu identifier type, the valid types: \"DeviceID\", \"Name\".",
+		},
+		{
+			testCase: "with too small diskSize provided",
+			modifySpec: func(p *machinev1.NutanixMachineProviderConfig) {
+				p.DataDisks = append(p.DataDisks, machinev1.NutanixVMDisk{DiskSize: resource.MustParse("500Mi")})
+			},
+			expectedOk:    false,
+			expectedError: "providerSpec.dataDisks.diskSize: Invalid value: \"524288000 bytes\": The minimum diskSize is 1Gi bytes.",
+		},
 		{
 			testCase:      "with all required fields it succeeds",
 			expectedOk:    true,