Skip to content

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Sep 1, 2025

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
Before this PR the topology controller was adding the conversion-data annotation to the Cluster object.

This happened because:

  • we are calling v1beta1Cluster.ConvertFrom(cluster) in a few code paths
  • ConvertFrom has a side effect that it adds the conversion annotation
  • ideally this would only be added on the v1beta1 Cluster, but the generated conversion code is using out.ObjectMeta = in.ObjectMeta for conversion. So both objects are updated

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 #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 1, 2025
@sbueringer sbueringer added the area/clusterclass Issues or PRs related to clusterclass label Sep 1, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Sep 1, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer force-pushed the pr-fixup-conversion-annotation branch from 9d2752c to 884e0ea Compare September 1, 2025 17:07
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

/lgtm
/approve

/hold check on artifacts

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2025
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 1, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 7f5cf7a4f17df96a54b25c968c4dff5499558e10

@k8s-ci-robot
Copy link
Contributor

[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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2025
@hackeramitkumar
Copy link
Member

/lgtm
Thanks

@sbueringer
Copy link
Member Author

/override pull-cluster-api-e2e-main
Unrelated flake

Artifacts look good

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 2, 2025
@k8s-ci-robot
Copy link
Contributor

@sbueringer: Overrode contexts on behalf of sbueringer: pull-cluster-api-e2e-main

In response to this:

/override pull-cluster-api-e2e-main
Unrelated flake

Artifacts look good

/hold cancel

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-ci-robot k8s-ci-robot merged commit 4429cb3 into kubernetes-sigs:main Sep 2, 2025
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Sep 2, 2025
@sbueringer
Copy link
Member Author

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #12721

In response to this:

/cherry-pick release-1.11

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants