Skip to content

WIP: ⚠️ Remove Metal3Machine owner reference from BMH #2506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

WIP: ⚠️ Remove Metal3Machine owner reference from BMH #2506

wants to merge 4 commits into from
+122 −43

Conversation

kashifest
Copy link
Member

Metal3Machine should not own BMH. It should consume it and release it when not needed. we already put a M3M consumer reference on BMH. This also would mean that for pivoting use cases we must add the clusterctl move labels in the CRDs. Otherwise BMH wont be pivoted to target clusters.

⚠️ Now, BMH object/CRD needs to have The object has the clusterctl.cluster.x-k8s.io/move label or the clusterctl.cluster.x-k8s.io/move-hierarchy label to make sure BMH is pivoted to target cluster and removed from the source. clusterctl.cluster.x-k8s.io/move and clusterctl.cluster.x-k8s.io/move-hierarchy labels could be applied to single objects or at the CRD level (the label applies to all the objects).

We still keep the removal of owner reference code for one minor release cycle to facilitate upgrade scenario where a BMH could still have an owner reference set from previous version. Starting from v1.11.x minor cycle we will remove this code also.
Signed-off-by: Kashif Khan kashif.khan@est.tech

@metal3-io-bot metal3-io-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 22, 2025
@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign tuminoid for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@metal3-io-bot metal3-io-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 22, 2025
@kashifest
Copy link
Member Author

/hold
This is still WIP, pushed here only for testing, not ready to be merged yet.

@metal3-io-bot metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2025
@kashifest kashifest changed the title WIP: Remove Metal3Machine owner reference from BMH WIP: ⚠️ Remove Metal3Machine owner reference from BMH Apr 22, 2025
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

1 similar comment
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest kashifest force-pushed the remove/bmh-ownerRef branch from 4def180 to e92061b Compare April 23, 2025 06:46
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/hold

@kashifest
Copy link
Member Author

/hold cancel

@metal3-io-bot metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2025
@kashifest
Copy link
Member Author

/hold

@metal3-io-bot metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2025
@kashifest
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main

@kashifest
Copy link
Member Author

Run1: passed test https://jenkins.nordix.org/view/Metal3/job/metal3-centos-e2e-integration-test-main/1152/console

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

Run 2: Failed but unrelated IPA download issue https://jenkins.nordix.org/view/Metal3/job/metal3-centos-e2e-integration-test-main/1154/consoleFull

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

@kashifest kashifest force-pushed the remove/bmh-ownerRef branch from e92061b to 1a836b0 Compare April 24, 2025 07:17
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

@kashifest kashifest force-pushed the remove/bmh-ownerRef branch from 1a836b0 to 74bbadf Compare April 24, 2025 12:12
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

@kashifest kashifest force-pushed the remove/bmh-ownerRef branch from 74bbadf to 24a8ff0 Compare April 25, 2025 06:17
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

8 similar comments
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

https://jenkins.nordix.org/view/Metal3/job/metal3-centos-e2e-integration-test-main/1289/consoleFull

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

1 similar comment
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

https://jenkins.nordix.org/view/Metal3/job/metal3-centos-e2e-integration-test-main/1291/consoleFull

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

5 similar comments
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

kashifest and others added 4 commits July 21, 2025 16:32
@kashifest
Remove Metal3Machine owner reference from BMH
581ea80 
Metal3Machine should not own BMH. It should consume it and release it when not needed. we already put a M3M consumer reference on BMH. This also would mean that for pivoting use cases we must add the clusterctl move labels in the CRDs. Otherwise BMH wont be pivoted to target clusters.

⚠️ Now, BMH object/CRD needs to have The object has the clusterctl.cluster.x-k8s.io/move label or the clusterctl.cluster.x-k8s.io/move-hierarchy  label to make sure BMH is pivoted to target cluster and removed from the source. clusterctl.cluster.x-k8s.io/move and clusterctl.cluster.x-k8s.io/move-hierarchy labels could be applied to single objects or at the CRD level (the label applies to all the objects).

We still keep the removal of owner reference code for one minor release cycle to facilitate upgrade scenario where a BMH could still have an owner reference set from previous version. Starting from v1.11.x minor cycle we will remove this code also.
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
@kashifest
BMH pause annotation should be synced with CAPM3 machine
9891c4d 
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
@kashifest
Block Move
2f54150 
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
@kashifest
Add manual paused annotation
7e055ce 
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
@kashifest kashifest force-pushed the remove/bmh-ownerRef branch from 8cd858b to 7e055ce Compare July 22, 2025 07:05
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

1 similar comment
@kashifest
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@metal3-io-bot
Copy link
Contributor

@kashifest: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
metal3-centos-e2e-integration-test-main 7e055ce link true /test metal3-centos-e2e-integration-test-main

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. I understand the commands that are listed here.

@metal3-io-bot
Copy link
Contributor

@kashifest: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
metal3-centos-e2e-integration-test-main 7e055ce link true /test metal3-centos-e2e-integration-test-main

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@metal3-io-bot metal3-io-bot added the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2025
@metal3-io-bot
Copy link
Contributor

PR needs rebase.

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
Reviewers

@adilGhaffarDev adilGhaffarDev Awaiting requested review from adilGhaffarDev

@Rozzii Rozzii Awaiting requested review from Rozzii

Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kashifest @metal3-io-bot