🐛 fix: use machine's .spec.failureDomain with fallback to vspheremachine's .spec.failureDomain if not defined

[jcpowermac]

What this PR does / why we need it:

This commit sets failureDomain string defaulting to
machine.Spec.FailureDomain. If failureDomain
is an empty string then vsphereMachine.Spec.FailureDomain is
checked for nil, if defined failureDomain is set
to vsphereMachine.Spec.FailureDomain.

This resolves an issue where virtual machines are not placed
within vm-host groups in a timely
manner causing misplacement in the topology.

Fixes #3575

[k8s-ci-robot]

Welcome @jcpowermac!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-vsphere 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-vsphere has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @jcpowermac. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

[rvanderp3]

/ok-to-test

[rvanderp3]

/lgtm

/assign @sbueringer

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 29283286600b1e3b812f33127e495556fc7d4a05

[jcpowermac]

@chrischdi @sbueringer updated per comments ptal, thanks!

[chrischdi]

/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 703f4d802e96bfb1b8c05d1eae9d5e9398b4156d

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [chrischdi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[chrischdi]

Thanks for bringing this up 🎉

[sbueringer]

/lgtm

[sbueringer]

/cherry-pick release-1.14

[k8s-infra-cherrypick-robot]

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.14

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-sigs/prow repository.

[k8s-infra-cherrypick-robot]

@sbueringer: new pull request created: #3587

In response to this:

/cherry-pick release-1.14

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-sigs/prow repository.

[chrischdi]

/retitle 🐛 fix: use machine's .spec.failureDomain with fallback to vspheremachine's .spec.failureDomain if not defined

[chrischdi]

/cherry-pick release-1.13

[chrischdi]

/cherry-pick release-1.12

[k8s-infra-cherrypick-robot]

@chrischdi: #3576 failed to apply on top of branch "release-1.13":

Applying: fix: use vspheremachine fd if machine is empty
Using index info to reconstruct a base tree...
M	controllers/vspherevm_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vspherevm_controller.go
CONFLICT (content): Merge conflict in controllers/vspherevm_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix: use vspheremachine fd if machine is empty

In response to this:

/cherry-pick release-1.13

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-sigs/prow repository.

[k8s-infra-cherrypick-robot]

@chrischdi: #3576 failed to apply on top of branch "release-1.12":

Applying: fix: use vspheremachine fd if machine is empty
Using index info to reconstruct a base tree...
M	controllers/vspherevm_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vspherevm_controller.go
CONFLICT (content): Merge conflict in controllers/vspherevm_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix: use vspheremachine fd if machine is empty

In response to this:

/cherry-pick release-1.12

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-sigs/prow repository.