🌱 controllers: fix ProviderServiceAccount tests to create objects on-demand

[chrischdi]

What this PR does / why we need it:

This PR changes the controllers tests for serviceaccount_controller and servicediscovery_controller to only create the objects which are required, instead of creating all and deleting the ones not required.

This solves a race condition for the serviceaccount_controller related test cases for the following cases:

• https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/controllers/serviceaccount_controller_intg_test.go#L130
• https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/controllers/serviceaccount_controller_intg_test.go#L156

In case of this tests, the serviceaccount_controller could already have reconciled once successfully and added a successful ProviderServiceAccountsReadyCondition before the tests have deleted the relevant objects.

This gets reproducible by adding a time.Sleep(time.Second) before the deletion, e.g. at:

• https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/controllers/serviceaccount_controller_intg_test.go#L133
• https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/controllers/serviceaccount_controller_intg_test.go#L159

This solves the flake we heavily see on release-1.7:

E.g.:

• https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/periodic-cluster-api-provider-vsphere-test-release-1-7/1788104398212173824
• https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/periodic-cluster-api-provider-vsphere-test-release-1-7/1788074199512780800

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/hold

I want to do final verification locally

[chrischdi]

/cherry-pick release-1.10

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.10

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]

/cherry-pick release-1.9

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.9

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]

/cherry-pick release-1.8

[k8s-infra-cherrypick-robot]

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

[chrischdi]

/cherry-pick release-1.7

[k8s-infra-cherrypick-robot]

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

[chrischdi]

/hold cancel

Works great also for release-1.7 (did a local manual cherry-pick).

Note: cherry-picker is expected to fail at least for 1.7, let's see which ones we have to manually cherry-pick

/assign @fabriziopandini @sbueringer

[sbueringer]

Can you please also rename the misleading funcs? (xref: #2983 (comment))

createCluster, etc.

[sbueringer]

Thx!

Very nice investigation! :)

/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 2aff8a7284383da35f5aad0bbd078f9f718bf2b3

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 [sbueringer]

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

[k8s-infra-cherrypick-robot]

@chrischdi: new pull request created: #2997

In response to this:

/cherry-pick release-1.9

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: #2983 failed to apply on top of branch "release-1.8":

Applying: controllers: fix ProviderServiceAccount tests to create objects on-demand
Using index info to reconstruct a base tree...
M	controllers/serviceaccount_controller_intg_test.go
A	controllers/servicediscovery_controller_intg_test.go
A	internal/test/helpers/vmware/intg_test_context.go
Falling back to patching base and 3-way merge...
Auto-merging test/helpers/vmware/intg_test_context.go
CONFLICT (content): Merge conflict in test/helpers/vmware/intg_test_context.go
Auto-merging controllers/svcdiscovery_controller_intg_test.go
Auto-merging controllers/serviceaccount_controller_intg_test.go
CONFLICT (content): Merge conflict in controllers/serviceaccount_controller_intg_test.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 controllers: fix ProviderServiceAccount tests to create objects on-demand
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-sigs/prow repository.

[k8s-infra-cherrypick-robot]

@chrischdi: #2983 failed to apply on top of branch "release-1.7":

Applying: controllers: fix ProviderServiceAccount tests to create objects on-demand
Using index info to reconstruct a base tree...
M	controllers/serviceaccount_controller_intg_test.go
A	controllers/servicediscovery_controller_intg_test.go
A	internal/test/helpers/vmware/intg_test_context.go
Falling back to patching base and 3-way merge...
Auto-merging test/helpers/vmware/intg_test_context.go
CONFLICT (content): Merge conflict in test/helpers/vmware/intg_test_context.go
Auto-merging controllers/svcdiscovery_controller_intg_test.go
Auto-merging controllers/serviceaccount_controller_intg_test.go
CONFLICT (content): Merge conflict in controllers/serviceaccount_controller_intg_test.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 controllers: fix ProviderServiceAccount tests to create objects on-demand
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-sigs/prow repository.

[k8s-infra-cherrypick-robot]

@chrischdi: new pull request created: #2998

In response to this:

/cherry-pick release-1.10

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.