fix: use types directly

Author: faiq

api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml

@@ -276,15 +276,18 @@ spec:
                             items:
                               properties:
                                 deviceID:
-                                  description: DeviceID is the id of the GPU entity.
+                                  description: deviceID is the id of the GPU entity.
                                   format: int64
                                   type: integer
                                 name:
-                                  description: Name is the GPU name
+                                  description: name is the GPU name
                                   type: string
                                 type:
                                   description: Type is the identifier type to use
                                     for this resource.
+                                  enum:
+                                  - deviceID
+                                  - name
                                   type: string
                               required:
                               - type

api/v1alpha1/crds/caren.nutanix.com_nutanixnodeconfigs.yaml

@@ -94,15 +94,18 @@ spec:
                         items:
                           properties:
                             deviceID:
-                              description: DeviceID is the id of the GPU entity.
+                              description: deviceID is the id of the GPU entity.
                               format: int64
                               type: integer
                             name:
-                              description: Name is the GPU name
+                              description: name is the GPU name
                               type: string
                             type:
                               description: Type is the identifier type to use for
                                 this resource.
+                              enum:
+                              - deviceID
+                              - name
                               type: string
                           required:
                           - type

api/v1alpha1/nutanix_node_types.go

@@ -63,21 +63,7 @@ type NutanixMachineDetails struct {
 
 	// List of GPU devices that need to be added to the machines.
 	// +kubebuilder:validation:Optional
-	GPUs []NutanixGPU `json:"gpus,omitempty"`
-}
-
-type NutanixGPU struct {
-	// Type is the identifier type to use for this resource.
-	// +kubebuilder:validation:Required
-	Type NutanixGPUIdentifierType `json:"type"`
-
-	// DeviceID is the id of the GPU entity.
-	// +kubebuilder:validation:Optional
-	DeviceID *int64 `json:"deviceID,omitempty"`
-
-	// Name is the GPU name
-	// +kubebuilder:validation:Optional
-	Name *string `json:"name,omitempty"`
+	GPUs []capxv1.NutanixGPU `json:"gpus,omitempty"`
 }
 
 // NutanixIdentifierType is an enumeration of different resource identifier types.
@@ -89,5 +75,3 @@ type NutanixBootType capxv1.NutanixBootType
 type NutanixResourceIdentifier capxv1.NutanixResourceIdentifier
 
 type NutanixCategoryIdentifier capxv1.NutanixCategoryIdentifier
-
-type NutanixGPUIdentifierType capxv1.NutanixGPUIdentifierType

api/v1alpha1/zz_generated.deepcopy.go

@@ -122,23 +122,13 @@ func (h *nutanixMachineDetailsPatchHandler) Mutate(
 					capxv1.NutanixResourceIdentifier(*nutanixMachineDetailsVar.Project),
 				)
 			}
-			if nutanixMachineDetailsVar.GPUs != nil {
-				spec.GPUs = make(
-					[]capxv1.NutanixGPU,
-					len(nutanixMachineDetailsVar.GPUs),
-				)
+			spec.GPUs = make(
+				[]capxv1.NutanixGPU,
+				len(nutanixMachineDetailsVar.GPUs),
+			)
 
-				for i, gpu := range nutanixMachineDetailsVar.GPUs {
-					gpuType := capxv1.NutanixGPUIdentifierType(gpu.Type)
-					spec.GPUs[i] = capxv1.NutanixGPU{
-						Type: gpuType,
-					}
-					if gpuType == capxv1.NutanixGPUIdentifierName {
-						spec.GPUs[i].Name = gpu.Name
-						continue
-					}
-					spec.GPUs[i].DeviceID = gpu.DeviceID
-				}
+			for i, gpu := range nutanixMachineDetailsVar.GPUs {
+				spec.GPUs[i] = gpu
 			}
 
 			obj.Spec.Template.Spec = spec

pkg/handlers/nutanix/mutation/machinedetails/inject.go

@@ -55,7 +55,7 @@ var (
 			Type: capxv1.NutanixIdentifierName,
 			Name: ptr.To("fake-project"),
 		}),
-		GPUs: []v1alpha1.NutanixGPU{
+		GPUs: []capxv1.NutanixGPU{
 			{
 				Type: "name",
 				Name: ptr.To("gpu1"),