Update MachinePool

apis/hive/v1/nutanix/machinepools.go

@@ -2,7 +2,6 @@ package nutanix
 
 import (
 	machinev1 "github.com/openshift/api/machine/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 // MachinePool stores the configuration for a machine pool installed
@@ -51,19 +50,16 @@ type MachinePool struct {
 	// +optional
 	Categories []machinev1.NutanixCategory `json:"categories,omitempty"`
 
-	//// GPUs is a list of GPU devices to attach to the machine's VM.
-	//// +listType=set
-	//// +kubebuilder:validation:X-KubernetesListType=set
-	//// +kubebuilder:validation:X-KubernetesMapType=atomic
-	//// +optional
-	//GPUs []machinev1.NutanixGPU `json:"gpus,omitempty"`
-	//
-	//// DataDisks holds information of the data disks to attach to the Machine's VM
-	//// +listType=set
-	//// +kubebuilder:validation:X-KubernetesListType=set
-	//// +kubebuilder:validation:X-KubernetesMapType=atomic
-	//// +optional
-	//DataDisks []DataDisk `json:"dataDisks,omitempty"`
+	// GPUs is a list of GPU devices to attach to the machine's VM.
+	// +kubebuilder:validation:X-KubernetesListType=set
+	// +kubebuilder:validation:X-KubernetesMapType=atomic
+	// +optional
+	GPUs []machinev1.NutanixGPU `json:"gpus,omitempty"`
+
+	// DataDisks holds information of the data disks to attach to the Machine's VM
+	// +kubebuilder:validation:X-KubernetesListType=set
+	// +optional
+	DataDisks []machinev1.NutanixVMDisk `json:"dataDisks,omitempty"`
 
 	// FailureDomains optionally configures a list of failure domain names
 	// that will be applied to the MachinePool
@@ -92,24 +88,3 @@ type StorageConfig struct {
 	// +optional
 	StorageContainer *StorageResourceReference `json:"storageContainer,omitempty"`
 }
-
-// DataDisk defines a data disk for a Machine VM.
-type DataDisk struct {
-	// diskSize is size (in Quantity format) of the disk to attach to the VM.
-	// See https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Format for the Quantity format and example documentation.
-	// The minimum diskSize is 1GB.
-	// +kubebuilder:validation:Required
-	DiskSize resource.Quantity `json:"diskSize"`
-
-	// deviceProperties are the properties of the disk device.
-	// +optional
-	DeviceProperties *machinev1.NutanixVMDiskDeviceProperties `json:"deviceProperties,omitempty"`
-
-	// storageConfig are the storage configuration parameters of the VM disks.
-	// +optional
-	StorageConfig *StorageConfig `json:"storageConfig,omitempty"`
-
-	// dataSource refers to a data source image for the VM disk.
-	// +optional
-	DataSourceImage *StorageResourceReference `json:"dataSourceImage,omitempty"`
-}

apis/hive/v1/nutanix/platform.go

@@ -1,6 +1,9 @@
 package nutanix
 
-import corev1 "k8s.io/api/core/v1"
+import (
+	configv1 "github.com/openshift/api/config/v1"
+	corev1 "k8s.io/api/core/v1"
+)
 
 // CredentialsSecretName is the default nutanix credentials secret name.
 //
@@ -40,6 +43,15 @@ type Platform struct {
 	// SubnetUUIDs identifies the network subnets to be used by the cluster.
 	// Currently, we only support one subnet for an OpenShift cluster.
 	SubnetUUIDs []string `json:"subnetUUIDs"`
+
+	// LoadBalancer defines how the load balancer used by the cluster is configured.
+	// LoadBalancer is available in TechPreview.
+	// +optional
+	LoadBalancer *configv1.NutanixPlatformLoadBalancer `json:"loadBalancer,omitempty"`
+
+	// FailureDomains configures failure domains for the Nutanix platform.
+	// +optional
+	FailureDomains []FailureDomain `json:"failureDomains,omitempty"`
 }
 
 // PrismCentral holds the endpoint and credentials data used to connect to the Prism Central