Merge pull request #3587 from k8s-infra-cherrypick-robot/cherry-pick-3576-to-release-1.14

[release-1.14] 🐛 fix: use machine's .spec.failureDomain with fallback to vspheremachine's .spec.failureDomain if not defined

Author: k8s-ci-robot

controllers/vspherevm_controller.go

@@ -233,8 +233,13 @@ func (r vmReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.R
 		return ctrl.Result{}, err
 	}
 
+	failureDomain := machine.Spec.FailureDomain
+	if failureDomain == "" && vsphereMachine.Spec.FailureDomain != nil {
+		failureDomain = *vsphereMachine.Spec.FailureDomain
+	}
+
 	var vsphereFailureDomain *infrav1.VSphereFailureDomain
-	if failureDomain := machine.Spec.FailureDomain; failureDomain != "" {
+	if failureDomain != "" {
 		vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{}
 		if err := r.Client.Get(ctx, apitypes.NamespacedName{Name: failureDomain}, vsphereDeploymentZone); err != nil {
 			return reconcile.Result{}, errors.Wrapf(err, "failed to get VSphereDeploymentZone %s", failureDomain)