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

✨ Add MachinePool Machine support in clusterctl discovery #8836

Merged
merged 1 commit into from
Jul 10, 2023

Conversation

Jont828
Copy link
Contributor

@Jont828 Jont828 commented Jun 12, 2023

What this PR does / why we need it: Allow clusterctl discovery to find MachinePool Machines and associated infraMachines.

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 12, 2023
@k8s-ci-robot k8s-ci-robot added area/clusterctl Issues or PRs related to clusterctl size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2023
@Jont828 Jont828 changed the title ✨ Add MachinePool Machine support in clusterctl discovery ✨ Add MachinePool Machine support in clusterctl discovery Jun 12, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 12, 2023

/assign @fabriziopandini

I've separated the clusterctl changes out from the main MPM PR. I think this change should be pretty straightforward to review. WDYT?

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.

thanks for this PR!
overall lgtm, only one small improvement from my side + if possible, let's add a test case into Test_Discovery

@ykakarap PTAL

cmd/clusterctl/client/tree/discovery.go Outdated Show resolved Hide resolved
cmd/clusterctl/client/tree/discovery.go Show resolved Hide resolved
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 23, 2023

@ykakarap Any thoughts?

Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

The overall approach looks good. Can you please add some unit tests for this under Test_Discovery?

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 27, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 28, 2023

@ykakarap I've added some tests, will rebase today as well.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 30, 2023
@Jont828 Jont828 force-pushed the mpm-clusterctl branch 2 times, most recently from 67ecf39 to 139cdd2 Compare July 7, 2023 03:31
@fabriziopandini
Copy link
Member

/retest

@fabriziopandini
Copy link
Member

@Jont828 it seems that some tests are broken after the changes to the fake objects in this PR

@Jont828
Copy link
Contributor Author

Jont828 commented Jul 10, 2023

@fabriziopandini Should be fixed (waiting on test results).

@fabriziopandini
Copy link
Member

/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 Jul 10, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: a529dcee344eab00a2d9b593ab0848e5ce30dd9b

@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 Jul 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 1fecd9f into kubernetes-sigs:main Jul 10, 2023
10 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Jul 10, 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/clusterctl Issues or PRs related to clusterctl 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resources representing MachinePool Machines
5 participants