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.

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

⚠️ Objects generated by KCP, MachineSets and MachinePools will now consistently use machine name #9833

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Dec 8, 2023

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

What this PR does / why we need it:
(Compared to the issue) I also implemented it for MachinePool Machines. There is nothing we can do about BootstrapConfig there because it belongs to the MachinePool not to individual Machines, but at least Machines and InfraMachines now have the same name.

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

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 8, 2023
@sbueringer sbueringer added area/provider/control-plane-kubeadm Issues or PRs related to KCP area/machineset Issues or PRs related to machinesets labels Dec 8, 2023
@k8s-ci-robot k8s-ci-robot removed do-not-merge/needs-area PR is missing an area label labels Dec 8, 2023
@sbueringer
Copy link
Member Author

/assign @fabriziopandini @enxebre @chrischdi

@sbueringer
Copy link
Member Author

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

@sbueringer sbueringer changed the title 🌱 Use the same names for Machine objects generated by KCP & MachineSets 🌱 Use the same names for Machine objects generated by KCP, MachineSets and MachinePools Dec 8, 2023
@sbueringer
Copy link
Member Author

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

@chrischdi
Copy link
Member

Small improvement nit.

As of that
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5534221d993ba9ec69fbefd0470773086ee45cf8

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2023
@chrischdi
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 Dec 12, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1457714298633f883ebb3d485f72cc8e91b71bd5

@sbueringer
Copy link
Member Author

/assign @killianmuldoon

If you have some time

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 13, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2023
@sbueringer
Copy link
Member Author

Rebased

/assign @chrischdi @fabriziopandini

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 14, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8b42b6e9dc5ad4c25fbb8829b29420105cdc773b

@fabriziopandini
Copy link
Member

/lgtm

Thanks! Name consistency will greatly improve triaging and investigating issues, as well as navigating the CAPI object hierarchy

@fabriziopandini
Copy link
Member

Changed the title to bubble this up in the release note

@fabriziopandini fabriziopandini changed the title 🌱 Use the same names for Machine objects generated by KCP, MachineSets and MachinePools ⚠️ Use objects generated by KCP, MachineSets and MachinePools will now consistently use machine name Dec 14, 2023
@enxebre
Copy link
Member

enxebre commented Dec 14, 2023

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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 Dec 14, 2023
@k8s-ci-robot k8s-ci-robot merged commit 679d30b into kubernetes-sigs:main Dec 14, 2023
25 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Dec 14, 2023
@sbueringer sbueringer deleted the pr-same-names branch December 14, 2023 16:05
@sbueringer sbueringer changed the title ⚠️ Use objects generated by KCP, MachineSets and MachinePools will now consistently use machine name ⚠️ Objects generated by KCP, MachineSets and MachinePools will now consistently use machine name Dec 14, 2023
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/machineset Issues or PRs related to machinesets area/provider/control-plane-kubeadm Issues or PRs related to KCP 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
Development

Successfully merging this pull request may close these issues.

Generate Machine / InfraMachine / BootstrapConfig with the same name
6 participants