Skip to content

✨ Only set ownerReference on InfraCluster/ControlPlane when Topology is defined#13332

Merged
k8s-ci-robot merged 4 commits intokubernetes-sigs:mainfrom
sivchari:fix-metacontroller-compatibility
Mar 10, 2026
Merged

✨ Only set ownerReference on InfraCluster/ControlPlane when Topology is defined#13332
k8s-ci-robot merged 4 commits intokubernetes-sigs:mainfrom
sivchari:fix-metacontroller-compatibility

Conversation

@sivchari
Copy link
Copy Markdown
Member

What this PR does / why we need it:

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

@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-area PR is missing an area label label Feb 12, 2026
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 12, 2026
@sbueringer sbueringer added the area/cluster Issues or PRs related to clusters label Feb 24, 2026
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Feb 24, 2026
@sbueringer
Copy link
Copy Markdown
Member

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

@sivchari sivchari force-pushed the fix-metacontroller-compatibility branch from f944317 to 1cdabc3 Compare March 6, 2026 12:05
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Mar 7, 2026
Copy link
Copy Markdown
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last finding

Copy link
Copy Markdown
Member

@sbueringer sbueringer Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also adjust this

(currently we don't hit the no-op code path if the cluster is not topology managed)

@sivchari sivchari force-pushed the fix-metacontroller-compatibility branch from 1cdabc3 to 938c734 Compare March 9, 2026 07:30
@sbueringer
Copy link
Copy Markdown
Member

@sivchari I know there should be no conflict but please rebase this PR after #13367 is merged. Just want to take a look at the final state before merging this PR

sivchari added 4 commits March 9, 2026 21:17
… defined

Signed-off-by: sivchari <shibuuuu5@gmail.com>
…s not defined

Address review feedback: ownerReference should always be set for cascade
deletion. When Topology is defined, use SetControllerReference (controller:
true) so CAPI fully manages the lifecycle. When Topology is not defined,
use SetOwnerReference (controller: false) to enable cascade deletion while
allowing external tools to set their own controller ownerReference.
Signed-off-by: sivchari <shibuuuu5@gmail.com>
Signed-off-by: sivchari <shibuuuu5@gmail.com>
@sivchari sivchari force-pushed the fix-metacontroller-compatibility branch from 938c734 to 541de6b Compare March 9, 2026 12:17
@sivchari
Copy link
Copy Markdown
Member Author

sivchari commented Mar 9, 2026

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

@sbueringer
Copy link
Copy Markdown
Member

Thank you very much!!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: a7928d51586879a69d04c39d5c552b95f219c810

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[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

Details 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 Mar 10, 2026
@k8s-ci-robot k8s-ci-robot merged commit a1ecda8 into kubernetes-sigs:main Mar 10, 2026
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.13 milestone Mar 10, 2026
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/cluster Issues or PRs related to clusters 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Compatibility with metacontroller

3 participants