Update NICs and providerID on create

Author: JoelSpeed

pkg/cloud/azure/actuators/machine/actuator_test.go

@@ -343,8 +343,9 @@ func TestReconcileVMSuceededState(t *testing.T) {
 		t.Errorf("failed to create machine: %+v", err)
 	}
 
-	if fakeVMService.GetCallCount != 1 {
-		t.Errorf("expected get to be called just once")
+	if fakeVMService.GetCallCount != 2 {
+		// One call for create, and one for the update that happens when the create is successful.
+		t.Errorf("expected get to be called exactly twice")
 	}
 
 	if fakeVMService.DeleteCallCount != 0 {
@@ -359,11 +360,18 @@ func TestReconcileVMSuceededState(t *testing.T) {
 // FakeVMCheckZonesService generic fake vm zone service
 type FakeVMCheckZonesService struct {
 	checkZones []string
+	created    bool
 }
 
 // Get returns fake success.
 func (s *FakeVMCheckZonesService) Get(ctx context.Context, spec azure.Spec) (interface{}, error) {
-	return nil, errors.New("vm not found")
+	if !s.created {
+		return nil, errors.New("vm not found")
+	}
+
+	return &compute.VirtualMachine{
+		VirtualMachineProperties: &compute.VirtualMachineProperties{},
+	}, nil
 }
 
 // CreateOrUpdate returns fake success.
@@ -374,10 +382,12 @@ func (s *FakeVMCheckZonesService) CreateOrUpdate(ctx context.Context, spec azure
 	}
 
 	if len(s.checkZones) <= 0 {
+		s.created = true
 		return nil
 	}
 	for _, zone := range s.checkZones {
 		if strings.EqualFold(zone, vmSpec.Zone) {
+			s.created = true
 			return nil
 		}
 	}

pkg/cloud/azure/actuators/machine/reconciler.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute"
 	"github.com/Azure/go-autorest/autorest"
+	autorestazure "github.com/Azure/go-autorest/autorest/azure"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	"github.com/openshift/machine-api-operator/pkg/metrics"
@@ -139,6 +140,13 @@ func (s *Reconciler) CreateMachine(ctx context.Context) error {
 		return fmt.Errorf("failed to create vm %s: %w", s.scope.Machine.Name, err)
 	}
 
+	// Once we have created the machine, attempt to update it.
+	// This should set the network addresses and provider ID which should be set as soon
+	// as the machine is created, moving it to the provisioned phase.
+	if err := s.Update(ctx); err != nil {
+		return fmt.Errorf("failed to update machine %s: %w", s.scope.Machine.Name, err)
+	}
+
 	return nil
 }
 
@@ -700,8 +708,8 @@ func (s *Reconciler) createVirtualMachine(ctx context.Context, nicName, asName s
 			vmSpec.CustomData = userData
 		}
 
-		err = s.virtualMachinesSvc.CreateOrUpdate(ctx, vmSpec)
-		if err != nil {
+		// If we get an AsynOpIncompleteError, this means the VM is being created and we completed the request successfully.
+		if err := s.virtualMachinesSvc.CreateOrUpdate(ctx, vmSpec); err != nil && !errors.Is(err, autorestazure.NewAsyncOpIncompleteError("compute.VirtualMachinesCreateOrUpdateFuture")) {
 			metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
 				Name:      s.scope.Machine.Name,
 				Namespace: s.scope.Machine.Namespace,
@@ -712,6 +720,7 @@ func (s *Reconciler) createVirtualMachine(ctx context.Context, nicName, asName s
 			if errors.As(err, &detailedError) && detailedError.Message == "Failure sending request" {
 				return machinecontroller.InvalidMachineConfiguration("failure sending request for machine %s: %v", s.scope.Machine.Name, err)
 			}
+
 			return fmt.Errorf("failed to create VM: %w", err)
 		}
 	} else if err != nil {