Changes to support new optional fields of NutanixMachineProviderConfig

pkg/actuators/machine/actuator_test.go

@@ -164,6 +164,8 @@ func TestMachineEvents(t *testing.T) {
 				pspec.VCPUSockets = 0
 				pspec.MemorySize = resource.MustParse("1.5Gi")
 				pspec.SystemDiskSize = resource.MustParse("18Gi")
+				pspec.BootType = "invalid-boottype"
+				pspec.Project.Type = "uuid"
 				return pspec
 			}(),
 			operation: func(actuator *Actuator, machine *machinev1beta1.Machine) {
@@ -176,6 +178,8 @@ func TestMachineEvents(t *testing.T) {
 				"The minimum vCPU sockets of the VM is 1",
 				"The minimum memorySize is 2Gi bytes",
 				"The minimum systemDiskSize is 20Gi bytes",
+				"Invalid bootType, the valid bootType values are: \"\", \"Legacy\", \"UEFI\", \"SecureBoot\"",
+				"Missing project uuid",
 			},
 		},
 		{

pkg/actuators/machine/machine_scope.go

@@ -49,6 +49,9 @@ type machineScope struct {
 	machineToBePatched runtimeclient.Patch
 	providerSpec       *machinev1.NutanixMachineProviderConfig
 	providerStatus     *machinev1.NutanixMachineProviderStatus
+	// For Machine vm create/update use, take a copy of the providerSpec that we can mutate.
+	// This must never be written back to the Machine itself.
+	providerSpecValidated *machinev1.NutanixMachineProviderConfig
 }
 
 func newMachineScope(params machineScopeParams) (*machineScope, error) {

pkg/actuators/machine/reconciler.go

@@ -267,11 +267,13 @@ func (r *Reconciler) setProviderID(vmUUID *string) error {
 		klog.Infof("%s: ProviderID set at machine.spec: %s", r.machine.Name, providerID)
 	}
 
-	// update the corresponding node.Spec.ProviderID
-	var nodeName string
-	if r.machine.Status.NodeRef != nil {
-		nodeName = r.machine.Status.NodeRef.Name
+	if r.machine.Status.NodeRef == nil {
+		klog.Infof("%s: the Machine node is not ready yet.", r.machine.Name)
+		return nil
 	}
+
+	// update the corresponding node.Spec.ProviderID
+	nodeName := r.machine.Status.NodeRef.Name
 	if len(nodeName) == 0 {
 		nodeName = r.machine.Name
 	}

pkg/actuators/machine/utils.go

@@ -95,10 +95,20 @@ const (
 	NutanixCategoryValue     = "owned"
 )
 
-// Add the category for installer clueanup the Machine VM at cluster torn-down time
-// if the category exists in PC.
-func addCategory(mscp *machineScope, vmMetadata *nutanixClientV3.Metadata) error {
+// addCategories adds the category for installer clueanup the Machine VM
+// at cluster torn-down time if the category exists in PC.
+// Add the addtional categories to the Machine VM if configured
+func addCategories(mscp *machineScope, vmMetadata *nutanixClientV3.Metadata) error {
 	var err error
+	if vmMetadata.Categories == nil {
+		vmMetadata.Categories = make(map[string]string, len(mscp.providerSpec.Categories)+1)
+	}
+
+	// The addtional categories are already verified
+	for _, category := range mscp.providerSpec.Categories {
+		vmMetadata.Categories[category.Key] = category.Value
+	}
+
 	clusterID, ok := getClusterID(mscp.machine)
 	if !ok || clusterID == "" {
 		err = fmt.Errorf("%s: failed to get the clusterID", mscp.machine.Name)
@@ -113,10 +123,6 @@ func addCategory(mscp *machineScope, vmMetadata *nutanixClientV3.Metadata) error
 		return err
 	}
 
-	// Add the category to the vm metadata
-	if vmMetadata.Categories == nil {
-		vmMetadata.Categories = make(map[string]string, 1)
-	}
 	vmMetadata.Categories[categoryKey] = NutanixCategoryValue
 
 	return nil