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

🌱 Remove requeues in DockerMachinePool #9725

Merged
merged 1 commit into from
Nov 30, 2023
Merged

🌱 Remove requeues in DockerMachinePool #9725

merged 1 commit into from
Nov 30, 2023

Conversation

Jont828
Copy link
Contributor

@Jont828 Jont828 commented Nov 15, 2023 •
edited by CecileRobertMichon
Loading

What this PR does / why we need it: Follow up cleanups from #9096.

  • fix ensure ownerRefs to make sure DockerMachines always have an owner
  • Don't use RequeueAfter in DockerMachinePool controller delete, instead watch DockerMachines
  • Use ssa.Patch() for creating Machines in MachinePool controller

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 #

@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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 15, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

/area provider/infrastructure-docker

@k8s-ci-robot k8s-ci-robot added area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider and removed do-not-merge/needs-area PR is missing an area label labels Nov 15, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

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

2 similar comments
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

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

@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

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

@Jont828
Copy link
Contributor Author

Jont828 commented Nov 15, 2023

/retest

@Jont828 Jont828 force-pushed the mpm-capd-ownerref-fix branch from 44ece9a to 333edd3 Compare November 15, 2023 20:09
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 15, 2023
@Jont828 Jont828 force-pushed the mpm-capd-ownerref-fix branch from 333edd3 to 5b6f9f1 Compare November 15, 2023 20:10
@CecileRobertMichon
Copy link
Contributor

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

1 similar comment
@CecileRobertMichon
Copy link
Contributor

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

@CecileRobertMichon CecileRobertMichon changed the title 🌱 [WIP] Remove requeues in DockerMachinePool 🌱 Remove requeues in DockerMachinePool Nov 20, 2023
@CecileRobertMichon
Copy link
Contributor

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

CecileRobertMichon
CecileRobertMichon reviewed Nov 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.

this is ready pending full e2e test

/assign @sbueringer @fabriziopandini

sbueringer
sbueringer reviewed Nov 21, 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.

A few smaller findings. In general seems okay, but I would defer to folks familiar with the CAPD MachinePool implementation (didn't have time to catch up with the current state)

test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go 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_phases.go Outdated Show resolved Hide resolved
@CecileRobertMichon CecileRobertMichon mentioned this pull request Nov 21, 2023
Closed
@CecileRobertMichon
Copy link
Contributor

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

@CecileRobertMichon CecileRobertMichon mentioned this pull request Nov 21, 2023
Closed
@sbueringer
Copy link
Member

sbueringer commented Nov 22, 2023 •
edited
Loading

Thank you!

/lgtm

/assign @fabriziopandini

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

LGTM label has been added.

Git tree hash: ad4bd80869ea7aa00ad5263d95fef7726b730435

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

Removed conditions.WithStepCounterIf(false) since #9772 already merged

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

vincepri
vincepri approved these changes Nov 29, 2023
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/assign @CecileRobertMichon @sbueringer

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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, 2023
Jont828
Jont828 commented Nov 29, 2023
View reviewed changes
Copy link
Contributor Author

@Jont828 Jont828 left a comment

Choose a reason for hiding this comment

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

@CecileRobertMichon Thanks for taking this one over! The status update changes look great. I commented for the record but I can push these changes if you want.

test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Outdated Show resolved Hide resolved
test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go Show resolved Hide resolved
@CecileRobertMichon
Copy link
Contributor

@Jont828 feel free to push those changes

@Jont828 Jont828 force-pushed the mpm-capd-ownerref-fix branch from a5c5da2 to 610afe0 Compare November 29, 2023 23:41
@Jont828
Copy link
Contributor Author

Jont828 commented Nov 29, 2023

Done!

CecileRobertMichon
CecileRobertMichon reviewed Nov 29, 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.

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

LGTM label has been added.

Git tree hash: 81b4ece585371b1f50e187a15c3a71f553b217ab

@CecileRobertMichon
Copy link
Contributor

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

@killianmuldoon
Copy link
Contributor

/retest

@CecileRobertMichon
Copy link
Contributor

/retest

Seeing the same flake in other PRs... https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/9734/pull-cluster-api-e2e-full-main/1726964842192965632

@k8s-ci-robot k8s-ci-robot merged commit 0240b58 into kubernetes-sigs:main Nov 30, 2023
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Nov 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@vincepri vincepri vincepri approved these changes

@chrischdi chrischdi Awaiting requested review from chrischdi

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@sbueringer sbueringer Awaiting requested review from sbueringer

Assignees

@sbueringer sbueringer

@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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
8 participants
@Jont828 @CecileRobertMichon @sbueringer @k8s-ci-robot @killianmuldoon @chrischdi @vincepri @fabriziopandini