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

Support MachineDeployment adoption of MachineSets #799

Merged
merged 1 commit into from
Mar 4, 2019

Conversation

vincepri
Copy link
Member

@vincepri vincepri commented Mar 1, 2019

Signed-off-by: Vince Prignano [email protected]

What this PR does / why we need it:
This PR adds support in MachineDeployments to adopt existing MachineSets without a controller reference.

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

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:


@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 1, 2019
@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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 1, 2019
@vincepri vincepri force-pushed the deployment-adopt-set branch from 3b1aa7e to 96b8fbb Compare March 1, 2019 21:07
Copy link
Contributor

@chuckha chuckha left a comment

Choose a reason for hiding this comment

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

looks good~

pkg/controller/machinedeployment/controller.go Outdated Show resolved Hide resolved
@vincepri vincepri force-pushed the deployment-adopt-set branch from 96b8fbb to 5274bb8 Compare March 1, 2019 21:10
@detiber
Copy link
Member

detiber commented Mar 1, 2019

Overall the changes look good to me.

It might be good to add some tests to validate that we only adopt MachineSets under the appropriate conditions.

This will also require a new cluster-api release and an updated image to be pushed before this could be consumed by downstream providers (such as for the pivot workflow).

@vincepri
Copy link
Member Author

vincepri commented Mar 1, 2019

Will do later this afternoon, thanks!

@vincepri vincepri force-pushed the deployment-adopt-set branch from ae7a8ab to 28170b0 Compare March 4, 2019 16:42
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 4, 2019
@vincepri
Copy link
Member Author

vincepri commented Mar 4, 2019

@detiber ptal

@detiber
Copy link
Member

detiber commented Mar 4, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 4, 2019
@k8s-ci-robot k8s-ci-robot merged commit 0c2107f into kubernetes-sigs:master Mar 4, 2019
@vincepri vincepri deleted the deployment-adopt-set branch July 26, 2019 18:22
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. 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.

Add support for adopting existing MachineSets to MachineDeployments
4 participants