Skip to content
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

🌱 Ensure infra and bootstrap objects are owned by Machines #7593

Merged
merged 1 commit into from
Nov 29, 2022
Merged

🌱 Ensure infra and bootstrap objects are owned by Machines #7593

merged 1 commit into from
Nov 29, 2022

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Nov 22, 2022 •
edited
Loading

Signed-off-by: killianmuldoon kmuldoon@vmware.com

Ensure non-Machine controller OwnerReferences are always removed from infrastructure and bootstrap objects that reference those machines.

The direct impact of this is that the KubeadmControlPlane and MachineSet will no longer own infrastructure and bootstrap objects.

This currently includes #7591
Part of #7575

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 22, 2022
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 22, 2022
@killianmuldoon killianmuldoon mentioned this pull request Nov 22, 2022
Closed
@killianmuldoon killianmuldoon changed the title Ensure infra and bootstrap objects are owned by Machines ✨ Ensure infra and bootstrap objects are owned by Machines Nov 22, 2022
@killianmuldoon killianmuldoon changed the title ✨ Ensure infra and bootstrap objects are owned by Machines 🌱 Ensure infra and bootstrap objects are owned by Machines Nov 22, 2022
@killianmuldoon killianmuldoon changed the title 🌱 Ensure infra and bootstrap objects are owned by Machines 🌱 [WIP] Ensure infra and bootstrap objects are owned by Machines Nov 23, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 23, 2022
@sbueringer
Copy link
Member

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot
Copy link

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

/cherry-pick release-1.2

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.

@sbueringer
Copy link
Member

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.3

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.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 28, 2022
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 28, 2022
@killianmuldoon killianmuldoon changed the title 🌱 [WIP] Ensure infra and bootstrap objects are owned by Machines 🌱 Ensure infra and bootstrap objects are owned by Machines Nov 28, 2022
@killianmuldoon killianmuldoon force-pushed the fix-dual-adoption branch 2 times, most recently from f783f55 to c439fed Compare November 28, 2022 13:55
fabriziopandini
fabriziopandini reviewed Nov 28, 2022
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

last round of nits, otherwise lgtm for me

internal/controllers/machine/machine_controller_phases.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller_phases.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller_phases.go Show resolved Hide resolved
@killianmuldoon
Ensure infra and bootstrap objects are owned by Machines
e384bd0 
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
fabriziopandini
fabriziopandini reviewed Nov 28, 2022
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm
@sbueringer over to you for a final pass

@sbueringer
Copy link
Member

Thank you!

/approve

@k8s-ci-robot
Copy link
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

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 Nov 29, 2022
@sbueringer
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2022
@k8s-ci-robot k8s-ci-robot merged commit bae19a2 into kubernetes-sigs:main Nov 29, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Nov 29, 2022
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 29, 2022
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #7653

In response to this:

/cherry-pick release-1.2

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 29, 2022
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #7654

In response to this:

/cherry-pick release-1.3

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
5 participants
@killianmuldoon @sbueringer @k8s-infra-cherrypick-robot @k8s-ci-robot @fabriziopandini