🐛 Handle missing VSphereFailureDomain on VSphereDeploymentZone deletion

[killianmuldoon]

Reorder the reconcile function of the VSphereDeploymentZone in order to ensure deletion can proceed even if the failureDomain does not exist.

[killianmuldoon]

/cherry-pick release-1.8

[killianmuldoon]

/cherry-pick release-1.7

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.7

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.

[killianmuldoon]

/cherry-pick release-1.8

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.8

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.

[codecov]

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (c92270a) 60.74% compared to head (448c4c4) 60.81%.
Report is 9 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2351      +/-   ##
==========================================
+ Coverage   60.74%   60.81%   +0.07%     
==========================================
  Files         164      164              
  Lines        9473     9475       +2     
==========================================
+ Hits         5754     5762       +8     
+ Misses       3301     3297       -4     
+ Partials      418      416       -2     

Files	Coverage Δ
pkg/context/vspheredeploymentzone_context.go	84.61% <ø> (-2.06%)	⬇️
pkg/taggable/get.go	64.70% <100.00%> (ø)
controllers/vspheredeploymentzone_controller.go	76.75% <92.85%> (-1.38%)	⬇️
...rollers/vspheredeploymentzone_controller_domain.go	47.79% <85.00%> (+2.94%)	⬆️

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[killianmuldoon]

Patch coverage: 100.00% and project coverage change: +10.11% 🎉

🤔

[chrischdi]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: a0e62a3ae7aeb48672c0b95c8e63ce7d08f94ec3

[chrischdi]

/approve

/hold if others want to review, feel free to unhold

[sbueringer]

Would it be feasible to add unit tests for this controller? (maybe as a follow-up)

[sbueringer]

Thank you!

/lgtm
/approve cancel
/hold cancel

/assign @chrischdi

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 7d2b82824737ae303b4f6b9d615170b02bd124ae

[sbueringer]

/hold

Turns out I can't cancel approval from others :) (which makes sense)

@chrischdi PTAL before merge

[killianmuldoon]

/hold

For squash

[k8s-ci-robot]

@killianmuldoon: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-vsphere-apidiff-main	448c4c4	link	false	/test pull-cluster-api-provider-vsphere-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

[killianmuldoon]

@chrischdi would be good to get some eyes on this when you have time

[chrischdi]

Optional nit

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: e8f95014558b6e96f245050bee15f80bedcc2ef1

[chrischdi]

/approve

[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

[killianmuldoon]

/hold cancel

[k8s-infra-cherrypick-robot]

@killianmuldoon: #2351 failed to apply on top of branch "release-1.7":

Applying: Reorder VSphereDeploymentZone reconcile to fix deletion
Using index info to reconstruct a base tree...
M	controllers/vspheredeploymentzone_controller.go
M	controllers/vspheredeploymentzone_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vspheredeploymentzone_controller_test.go
Auto-merging controllers/vspheredeploymentzone_controller.go
CONFLICT (content): Merge conflict in controllers/vspheredeploymentzone_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Reorder VSphereDeploymentZone reconcile to fix deletion
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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.

[k8s-infra-cherrypick-robot]

@killianmuldoon: #2351 failed to apply on top of branch "release-1.8":

Applying: Reorder VSphereDeploymentZone reconcile to fix deletion
Using index info to reconstruct a base tree...
M	controllers/vspheredeploymentzone_controller.go
M	controllers/vspheredeploymentzone_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vspheredeploymentzone_controller_test.go
Auto-merging controllers/vspheredeploymentzone_controller.go
CONFLICT (content): Merge conflict in controllers/vspheredeploymentzone_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Reorder VSphereDeploymentZone reconcile to fix deletion
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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.

[killianmuldoon]

Not going to be able to cherry-pick this one the way it turned out - given the context changes.