🌱 add preCreateCluster hook and CNIPath to e2e clusterctl upgrade test

[mboukhalfa]

What this PR does / why we need it:
Adds a PreWaitForCluster hook after creating the target management cluster to allow adding any custom resources that might be needed by some providers.
Adds CNIManifestPath as an input parameter.

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 #6465

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: mboukhalfa / name: Mohammed BOUKHALFA (4652cb7)

[k8s-ci-robot]

Welcome @mboukhalfa!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. 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 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 @mboukhalfa. 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/test-infra repository.

[killianmuldoon]

/ok-to-test

[mboukhalfa]

st approved the linter, not sure if it has finding

How can run the linter check ?

[sbueringer]

How can run the linter check ?

You can't run it on PRs. Unfortunately on PRs of new contributors this can be approved only by someone with write access to the repo. This is a limitation in Prow today (/ok-to-test only works on ProwJobs not on golangci-lint actions).

Locally you can run it with make lint.

[sbueringer]

/lgtm

[fabriziopandini]

/lgtm
/approve

Let's merge as it is to unblock work, but in future we might want to revisit this in order to split waiters for the management cluster from waiters for the workload cluster (names are randomly generated and with the current solution we can really detect when being called for one and when for the other).

[mboukhalfa]

/lgtm /approve

Let's merge as it is to unblock work, but in future we might want to revisit this in order to split waiters for the management cluster from waiters for the workload cluster (names are randomly generated and with the current solution we can really detect when being called for one and when for the other).

Thanks @fabriziopandini from the provider side I am using managementClusterProxy name to check if it is the source cluster or not based on that I can separate the two calls but as you mentioned it can be redesigned to better separate the two call if it is fine to have more hooks

[mboukhalfa]

@sbueringer I have rebased since #7244 just got merged can you please re LGTM

[sbueringer]

@sbueringer I have rebased since #7244 just got merged can you please re LGTM

In general, yes. Just took another look at it and found something I was missing before.

I would run the full e2e tests after this one is fixed and then merge afterwards (per default on PRs we just run a few tests and those don't include the clusterctl upgrade test)

[sbueringer]

/test pull-cluster-api-e2e-full-main

/cherry-pick release-1.2
(to make it available earlier)

[k8s-infra-cherrypick-robot]

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

In response to this:

/test pull-cluster-api-e2e-full-main

/cherry-pick release-1.2
(to make it available earlier)

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.

[fabriziopandini]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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

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

[sbueringer]

/retest

[k8s-infra-cherrypick-robot]

@sbueringer: #6636 failed to apply on top of branch "release-1.2":

Applying: add PreWaitForCluster hook and CNIPath to e2e clusterctl upgrade test
Using index info to reconstruct a base tree...
M	test/e2e/clusterctl_upgrade.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/clusterctl_upgrade.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade.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 add PreWaitForCluster hook and CNIPath to e2e clusterctl upgrade test
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:

/test pull-cluster-api-e2e-full-main

/cherry-pick release-1.2
(to make it available earlier)

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.