Consider using VSphereVM instead of unstructured in VimMachineService.ReconcileNormal

[sbueringer]

In VimMachineService.ReconcileNormal we initially use VSphereVM when we call createOrPatchVSphereVM. Then suddenly we're switching to Unstructured. Even though the object will always be a VSphereVM.

I wonder if it would make sense to consistently use VSphereVM instead. I'm probably missing something but it would make a lot of the code a lot easier to just work with the typed object.

cluster-api-provider-vsphere/pkg/services/vimmachine.go

Lines 131 to 174 in 7c043af

	vmData, err := runtime.DefaultUnstructuredConverter.ToUnstructured(vm)
	if err != nil {
	return false, errors.Wrapf(err,
	"failed to convert %s to unstructured data",
	vm.GetObjectKind().GroupVersionKind().String())
	}
	vmObj := &unstructured.Unstructured{Object: vmData}
	vmObj.SetGroupVersionKind(vm.GetObjectKind().GroupVersionKind())
	vmObj.SetAPIVersion(vm.GetObjectKind().GroupVersionKind().GroupVersion().String())
	vmObj.SetKind(vm.GetObjectKind().GroupVersionKind().Kind)
	// Waits the VM's ready state.
	if ok, err := v.waitReadyState(ctx, vmObj); !ok {
	if err != nil {
	return false, errors.Wrapf(err, "unexpected error while reconciling ready state for %s", ctx)
	}
	ctx.Logger.Info("waiting for ready state")
	// VSphereMachine wraps a VMSphereVM, so we are mirroring status from the underlying VMSphereVM
	// in order to provide evidences about machine provisioning while provisioning is actually happening.
	conditions.SetMirror(ctx.VSphereMachine, infrav1.VMProvisionedCondition, conditions.UnstructuredGetter(vmObj))
	return true, nil
	}
	// Reconcile the VSphereMachine's provider ID using the VM's BIOS UUID.
	if ok, err := v.reconcileProviderID(ctx, vmObj); !ok {
	if err != nil {
	return false, errors.Wrapf(err, "unexpected error while reconciling provider ID for %s", ctx)
	}
	ctx.Logger.Info("provider ID is not reconciled")
	return true, nil
	}
	// Reconcile the VSphereMachine's node addresses from the VM's IP addresses.
	if ok, err := v.reconcileNetwork(ctx, vmObj); !ok {
	if err != nil {
	return false, errors.Wrapf(err, "unexpected error while reconciling network for %s", ctx)
	}
	ctx.Logger.Info("network is not reconciled")
	conditions.MarkFalse(ctx.VSphereMachine, infrav1.VMProvisionedCondition, infrav1.WaitingForNetworkAddressesReason, clusterv1.ConditionSeverityInfo, "")
	return true, nil
	}
	ctx.VSphereMachine.Status.Ready = true
	return false, nil

[sbueringer]

/help

[k8s-ci-robot]

@sbueringer:
This request has been marked as needing help from a contributor.

Guidelines

Please ensure that the issue body includes answers to the following questions:

• Why are we solving this issue?
• To address this issue, are there any code changes? If there are code changes, what needs to be done in the code and what places can the assignee treat as reference points?
• Does this issue have zero to low barrier of entry?
• How can the assignee reach out to you for help?

For more details on the requirements of such an issue, please see here and ensure that they are met.

If this request no longer meets these requirements, the label can be removed
by commenting with the /remove-help command.

In response to this:

/help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[zhanggbj]

/assign