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

✨ Add MachinePool Machine implementation to CAPD components #8842

Merged
merged 1 commit into from
Nov 15, 2023
Merged

✨ Add MachinePool Machine implementation to CAPD components #8842

merged 1 commit into from
Nov 15, 2023

Conversation

Jont828
Copy link
Contributor

@Jont828 Jont828 commented Jun 12, 2023 •
edited
Loading

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 12, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 12, 2023

/hold

Hold as this is rebased on top of #8828

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 12, 2023

/retest

1 similar comment
@Jont828
Copy link
Contributor Author

Jont828 commented Jun 13, 2023

/retest

@Jont828 Jont828 force-pushed the mpm-capd branch 3 times, most recently from 4f03a91 to 8143963 Compare June 16, 2023 22:32
@Jont828 Jont828 mentioned this pull request Jun 19, 2023
Closed
CecileRobertMichon
CecileRobertMichon reviewed Jun 20, 2023
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

Consider adding a detailed PR description since this PR will be used by others in the future as reference implementation for MachinePoolMachines in providers

test/infrastructure/docker/internal/controllers/dockermachine_controller.go Outdated Show resolved Hide resolved
test/infrastructure/docker/internal/controllers/dockermachine_controller.go Outdated Show resolved Hide resolved
sbueringer
sbueringer reviewed Jun 26, 2023
View reviewed changes
Copy link
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.

I'll take a closer look once we are a bit further with #8828

test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Outdated Show resolved Hide resolved
test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Outdated Show resolved Hide resolved
test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Outdated Show resolved Hide resolved
test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2023
@Jont828 Jont828 force-pushed the mpm-capd branch 2 times, most recently from 6de4ec0 to 7644767 Compare June 28, 2023 09:09
@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 28, 2023
@Jont828 Jont828 force-pushed the mpm-capd branch 6 times, most recently from cab7870 to 54f33ae Compare July 7, 2023 22:55
@Jont828
Copy link
Contributor Author

Jont828 commented Jul 8, 2023

/retest

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 84d0854427d0dfbd951dfb8d67a7ad29ced9d531

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

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

This was referenced Nov 15, 2023
Open
Merged
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

@CecileRobertMichon @fabriziopandini I've reverted the commits that caused the test failure and instead opened an issue #9724 to address that in a follow up as the requeues are not blocking this PR.

@CecileRobertMichon
Copy link
Contributor

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

LGTM label has been added.

Git tree hash: 09e973f37bc3f94cdb5b3ca097ce1af0baac3c21

@CecileRobertMichon
Copy link
Contributor

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

@fabriziopandini Full e2e test passed, are we good to merge?

@fabriziopandini
Copy link
Member

Thanks, @Jont828 for all the work here!
/lgtm
/approve

@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 Nov 15, 2023
@k8s-ci-robot k8s-ci-robot merged commit 8003f3f into kubernetes-sigs:main Nov 15, 2023
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Nov 15, 2023
@furkatgofurov7
Copy link
Member

Thanks @Jont828 @CecileRobertMichon working on this one.

Do we need to refer to #9522 from this PR as Fixes: to auto-close it?

@furkatgofurov7
Copy link
Member

furkatgofurov7 commented Nov 15, 2023 •
edited
Loading

Never mind: I think it is better if we keep it open to track and get CI signal since it is merged now.

@Jont828 Jont828 deleted the mpm-capd branch November 15, 2023 20:05
This was referenced Nov 15, 2023
Closed
Closed
Closed
@g-gaston
Copy link
Contributor

/remove-area clusterctl

@k8s-ci-robot k8s-ci-robot removed the area/clusterctl Issues or PRs related to clusterctl label Nov 21, 2023
@adilGhaffarDev adilGhaffarDev mentioned this pull request Nov 28, 2023
Closed
@Jont828 Jont828 mentioned this pull request Nov 29, 2023
Closed
@displague displague mentioned this pull request Dec 6, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@shyamradhakrishnan shyamradhakrishnan shyamradhakrishnan left review comments

@sbueringer sbueringer sbueringer left review comments

@mdbooth mdbooth mdbooth left review comments

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@fabriziopandini fabriziopandini

@CecileRobertMichon CecileRobertMichon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

Resources representing MachinePool Machines