Merge pull request #3351 from chrischdi/pr-vcsim-remove-template-networkinterface

🌱 vcsim: wait for powered on VM and use mac address reference to set IP

Author: k8s-ci-robot

controllers/vspherevm_controller.go

@@ -437,6 +437,9 @@ func (r vmReconciler) reconcileNormal(ctx context.Context, vmCtx *capvcontext.VM
 	// Do not proceed until the backend VM is marked ready.
 	if vm.State != infrav1.VirtualMachineStateReady {
 		log.Info(fmt.Sprintf("VM state is %q, waiting for %q", vm.State, infrav1.VirtualMachineStateReady))
+		if !vmCtx.VSphereVM.Status.RetryAfter.IsZero() {
+			return reconcile.Result{RequeueAfter: time.Until(vmCtx.VSphereVM.Status.RetryAfter.Time)}, nil
+		}
 		return reconcile.Result{}, nil
 	}
 

test/infrastructure/vcsim/controllers/vmip_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/vmware/govmomi/vim25/types"
@@ -71,6 +72,30 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
 		return reconcile.Result{}, nil
 	}
 
+	var macAddress string
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return reconcile.Result{}, errors.Wrapf(err, "failed to get devices for vm")
+	}
+	for _, device := range devices {
+		if ethernetCard, ok := device.(types.BaseVirtualEthernetCard); ok {
+			macAddress = ethernetCard.GetVirtualEthernetCard().MacAddress
+		}
+	}
+	if macAddress == "" {
+		return reconcile.Result{}, errors.Wrapf(err, "failed to find mac address")
+	}
+
+	powerState, err := vm.PowerState(ctx)
+	if err != nil {
+		return reconcile.Result{}, errors.Wrapf(err, "failed to check Power State of vm")
+	}
+
+	if powerState != types.VirtualMachinePowerStatePoweredOn {
+		// Requeue to wait for the VM to get powered on by CAPV or Supervisor first.
+		return reconcile.Result{RequeueAfter: time.Second}, nil
+	}
+
 	log.Info("Powering Off the VM before applying an IP")
 	task, err := vm.PowerOff(ctx)
 	if err != nil {
@@ -84,6 +109,7 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
 	spec := types.CustomizationSpec{
 		NicSettingMap: []types.CustomizationAdapterMapping{
 			{
+				MacAddress: macAddress,
 				Adapter: types.CustomizationIPSettings{
 					Ip: &types.CustomizationFixedIp{
 						IpAddress: "192.168.1.100",