🐛 fix: CAPA v1beta1 to v1beta2 generated conversion webhook

[damdo]

/kind regression

This PR addresses a conversion webhook failure introduced in CAPA v2.9.x.

Users upgrading from CAPA v1.x (who have v1beta1 resources like AWSClusterControllerIdentity still stored in etcd) are unable to access these resources after upgrading to v2.9.x.

Any attempt to get these objects fails with an invalid groupVersion error, as the webhook incorrectly returns a v1beta1 object when v1beta2 is expected.

The root cause was identified in our old and custom copy of the upstream conversion-gen tooling.
A change (introduced in PR #5447 ) caused the generator to incorrectly add out.TypeMeta = in.TypeMeta to the generated conversion functions (zz_generated.conversion.go).

This line improperly copies the apiVersion from the v1beta1 input object to the v1beta2 output object, causing the webhook to return an invalid payload.

This pull request resolves the issue by removing the old custom copy of the upstream conversion-gen, in favour of the up-to-date/latest mainline conversion-gen.
It follow that up with a regeneration of the conversion code which removes the problematic TypeMeta assignment.

More details in the Slack thread: https://kubernetes.slack.com/archives/CD6U2V71N/p1762863174053729

fix: CAPA v1beta1 to v1beta2 resources generated conversion webhook

[k8s-ci-robot]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[richardcase]

Looks good to me @damdo 👍

Ping when its out of draft/wip

[chrischdi]

This needs a make generate-go. Then it should be good to go :-) (pending tests)

[chrischdi]

/test pull-cluster-api-provider-aws-verify

(verify it should require a make generate-go

[chrischdi]

go mod tidy also seems to be missing :D

[chrischdi]

/test pull-cluster-api-provider-aws-verify

[damdo]

@chrischdi @richardcase @AndiDog

#5740 merged
So I now rebased this, rerun make generate, cleaned up all the references to third_party and fixed go mod for hack/tools

It should be ready to go now

[damdo]

/test pull-cluster-api-provider-aws-test

[damdo]

/test ?

[k8s-ci-robot]

@damdo: The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-aws-build

/test pull-cluster-api-provider-aws-build-docker

/test pull-cluster-api-provider-aws-e2e-blocking

/test pull-cluster-api-provider-aws-test

/test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-aws-apidiff-main

/test pull-cluster-api-provider-aws-e2e

/test pull-cluster-api-provider-aws-e2e-clusterclass

/test pull-cluster-api-provider-aws-e2e-conformance

/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

/test pull-cluster-api-provider-aws-e2e-eks

/test pull-cluster-api-provider-aws-e2e-eks-gc

/test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-aws-apidiff-main

pull-cluster-api-provider-aws-build

pull-cluster-api-provider-aws-build-docker

pull-cluster-api-provider-aws-e2e-blocking

pull-cluster-api-provider-aws-test

pull-cluster-api-provider-aws-verify

In response to this:

/test ?

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.

[damdo]

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

[damdo]

/hold

For testing

[damdo]

/assign @richardcase @AndiDog @chrischdi

[chrischdi]

Nice cleanup

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: b317edcd6830e2795968f41c3b43270840e54770

[richardcase]

/approve

[chrischdi]

/cherry-pick release-2.9

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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

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: once the present PR merges, I will cherry-pick it on top of release-2.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.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.

[damdo]

/unhold

[chrischdi]

/cherry-pick release-2.9

[k8s-infra-cherrypick-robot]

@chrischdi: #5739 failed to apply on top of branch "release-2.9":

Applying: hack/tools: use mainstream conversion-gen
Using index info to reconstruct a base tree...
M	hack/tools/Makefile
M	hack/tools/go.mod
Falling back to patching base and 3-way merge...
Removing hack/tools/third_party/conversion-gen/main.go
Removing hack/tools/third_party/conversion-gen/generators/conversion.go
Removing hack/tools/third_party/conversion-gen/README.md
Removing hack/tools/third_party/conversion-gen/LICENSE
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
Auto-merging hack/tools/Makefile
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 hack/tools: use mainstream conversion-gen

In response to this:

/cherry-pick release-2.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]

@damdo : needs a manual cherry-pick

[damdo]

Manual backport done in #5744